Merge branch 'v2-dev' into v2_admin_mode

This commit is contained in:
xiaojunnuo
2026-02-13 22:58:07 +08:00
2 changed files with 7 additions and 7 deletions
@@ -45,15 +45,16 @@
</template> </template>
<script setup lang="tsx"> <script setup lang="tsx">
import { notification } from "ant-design-vue";
import { merge } from "lodash-es";
import { reactive } from "vue"; import { reactive } from "vue";
import * as api from "./api"; import * as api from "./api";
import { UserSiteMonitorSetting } from "./api"; import { UserSiteMonitorSetting } from "./api";
import { notification } from "ant-design-vue";
import { merge } from "lodash-es";
import { useSettingStore } from "/src/store/settings";
import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
import { useUserStore } from "/@/store/user"; import { useUserStore } from "/@/store/user";
import { utils } from "/@/utils";
import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
import { useI18n } from "/src/locales"; import { useI18n } from "/src/locales";
import { useSettingStore } from "/src/store/settings";
const { t } = useI18n(); const { t } = useI18n();
@@ -74,6 +75,7 @@ async function loadUserSettings() {
loadUserSettings(); loadUserSettings();
const doSave = async (form: any) => { const doSave = async (form: any) => {
await utils.sleep(1);
await api.SiteMonitorSettingsSave({ await api.SiteMonitorSettingsSave({
...formState, ...formState,
}); });
@@ -69,7 +69,7 @@ export class UserSettingsController extends CrudController<UserSettingsService>
const entity = await this.service.getByKey(key, userId, projectId); const entity = await this.service.getByKey(key, userId, projectId);
return this.ok(entity); return this.ok(entity);
} }
@Post("/grant/get", { summary: Constants.per.authOnly }) @Post("/grant/get", { summary: Constants.per.authOnly })
async grantSettingsGet() { async grantSettingsGet() {
const userId = this.getUserId(); const userId = this.getUserId();
const setting = await this.service.getSetting<UserGrantSetting>(userId, null, UserGrantSetting); const setting = await this.service.getSetting<UserGrantSetting>(userId, null, UserGrantSetting);
@@ -89,6 +89,4 @@ export class UserSettingsController extends CrudController<UserSettingsService>
return this.ok({}); return this.ok({});
} }
} }