Merge branch 'dev-fix-ww' into 'main_dev'

feat: 新增任务中心间隔时间单位(秒)使用环境变量控制

See merge request yunteng/thingskit-front!570

@@ -39,3 +39,6 @@ VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 500000
 
 # Alarm Notify Auto Close Time Unit is Second
 VITE_GLOB_ALARM_NOTIFY_DURATION = 5
+
+# Should Disabled Task Center Execute Interval Unit (Second)
+VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false

-# Whether to open mock
-VITE_GLOB_USE_MOCK = false
-
-# public path
-VITE_GLOB_PUBLIC_PATH = /
-
-# Delete console
-VITE_GLOB_DROP_CONSOLE = true
-
-# Whether to enable gzip or brotli compression
-# Optional: gzip | brotli | none
-# If you need multiple forms, you can use `,` to separate
-VITE_GLOB_BUILD_COMPRESS = 'gzip'
-
-# Whether to delete origin files when using compress, default false
-VITE_GLOB_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
-
-# Basic interface address SPA
-VITE_GLOB_API_URL=http://122.9.141.195:8080/api
-
-# File upload address， optional
-# It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=http://122.9.141.195:8080/api/yt/oss/upload
-
-# Interface prefix
-VITE_GLOB_API_URL_PREFIX=/yt
-
-# Whether to enable image compression
-VITE_GLOB_USE_IMAGEMIN= false
-
-# use pwa
-VITE_USE_PWA = false
-
-# Is it compatible with older browsers
-VITE_LEGACY = true
-
-# 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://122.9.141.195:8080/api/ws/plugins/telemetry?token=
-
-#configuration
-VITE_GLOB_CONFIGURATION = /thingskit-scada
-
-# 大屏设计器
-VITE_GLOB_LARGE_DESIGNER = /large-designer
-
-# Content Security Policy
-VITE_GLOB_CONTENT_SECURITY_POLICY = false
-
-# Alarm Notify Polling Interval Time
-VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 60000
-
-# Alarm Notify Auto Close Time Unit is Second
-VITE_GLOB_ALARM_NOTIFY_DURATION = 5
+# Whether to open mock
+VITE_GLOB_USE_MOCK = false
+
+# public path
+VITE_GLOB_PUBLIC_PATH = /
+
+# Delete console
+VITE_GLOB_DROP_CONSOLE = true
+
+# Whether to enable gzip or brotli compression
+# Optional: gzip | brotli | none
+# If you need multiple forms, you can use `,` to separate
+VITE_GLOB_BUILD_COMPRESS = 'gzip'
+
+# Whether to delete origin files when using compress, default false
+VITE_GLOB_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
+
+# Basic interface address SPA
+VITE_GLOB_API_URL=http://122.9.141.195:8080/api
+
+# File upload address， optional
+# It can be forwarded by nginx or write the actual address directly
+VITE_GLOB_UPLOAD_URL=http://122.9.141.195:8080/api/yt/oss/upload
+
+# Interface prefix
+VITE_GLOB_API_URL_PREFIX=/yt
+
+# Whether to enable image compression
+VITE_GLOB_USE_IMAGEMIN= false
+
+# use pwa
+VITE_USE_PWA = false
+
+# Is it compatible with older browsers
+VITE_LEGACY = true
+
+# 实时数据的ws地址
+VITE_GLOB_WEB_SOCKET = ws://122.9.141.195:8080/api/ws/plugins/telemetry?token=
+
+#configuration
+VITE_GLOB_CONFIGURATION = /thingskit-scada
+
+# 大屏设计器
+VITE_GLOB_LARGE_DESIGNER = /large-designer
+
+# Content Security Policy
+VITE_GLOB_CONTENT_SECURITY_POLICY = false
+
+# Alarm Notify Polling Interval Time
+VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 60000
+
+# Alarm Notify Auto Close Time Unit is Second
+VITE_GLOB_ALARM_NOTIFY_DURATION = 5
+
+# Should Disabled Task Center Execute Interval Unit (Second)
+VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND = false

@@ -23,3 +23,8 @@ export enum TimeUnitNameEnum {
   MINUTE = '分',
   HOUR = '时',
 }
+
+export enum BooleanStringEnum {
+  TRUE = 'true',
+  FALSE = 'false',
+}

-import type { GlobConfig } from '/#/config';
-
-import { warn } from '/@/utils/log';
-import { getAppEnvConfig } from '/@/utils/env';
-
-export const useGlobSetting = (): Readonly<GlobConfig> => {
-  const {
-    VITE_GLOB_APP_TITLE,
-    VITE_GLOB_API_URL,
-    VITE_GLOB_APP_SHORT_NAME,
-    VITE_GLOB_API_URL_PREFIX,
-    VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_CONFIGURATION,
-    VITE_GLOB_WEB_SOCKET,
-    VITE_GLOB_CONTENT_SECURITY_POLICY,
-    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
-    VITE_GLOB_ALARM_NOTIFY_DURATION,
-    VITE_GLOB_LARGE_DESIGNER,
-  } = getAppEnvConfig();
-
-  if (!/[a-zA-Z\_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
-    warn(
-      `VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`
-    );
-  }
-
-  // Take global configuration
-  const glob: Readonly<GlobConfig> = {
-    title: VITE_GLOB_APP_TITLE,
-    apiUrl: VITE_GLOB_API_URL,
-    shortName: VITE_GLOB_APP_SHORT_NAME,
-    urlPrefix: VITE_GLOB_API_URL_PREFIX,
-    uploadUrl: VITE_GLOB_UPLOAD_URL,
-    configurationPrefix: VITE_GLOB_CONFIGURATION,
-    largeDesignerPrefix: VITE_GLOB_LARGE_DESIGNER,
-    socketUrl: VITE_GLOB_WEB_SOCKET,
-    securityPolicy: VITE_GLOB_CONTENT_SECURITY_POLICY,
-    alarmNotifyDuration: VITE_GLOB_ALARM_NOTIFY_DURATION,
-    alarmPollingInterval: VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
-  };
-  return glob as Readonly<GlobConfig>;
-};
+import type { GlobConfig } from '/#/config';
+
+import { warn } from '/@/utils/log';
+import { getAppEnvConfig } from '/@/utils/env';
+
+export const useGlobSetting = (): Readonly<GlobConfig> => {
+  const {
+    VITE_GLOB_APP_TITLE,
+    VITE_GLOB_API_URL,
+    VITE_GLOB_APP_SHORT_NAME,
+    VITE_GLOB_API_URL_PREFIX,
+    VITE_GLOB_UPLOAD_URL,
+    VITE_GLOB_CONFIGURATION,
+    VITE_GLOB_WEB_SOCKET,
+    VITE_GLOB_CONTENT_SECURITY_POLICY,
+    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
+    VITE_GLOB_ALARM_NOTIFY_DURATION,
+    VITE_GLOB_LARGE_DESIGNER,
+    VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
+  } = getAppEnvConfig();
+
+  if (!/[a-zA-Z\_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
+    warn(
+      `VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`
+    );
+  }
+
+  // Take global configuration
+  const glob: Readonly<GlobConfig> = {
+    title: VITE_GLOB_APP_TITLE,
+    apiUrl: VITE_GLOB_API_URL,
+    shortName: VITE_GLOB_APP_SHORT_NAME,
+    urlPrefix: VITE_GLOB_API_URL_PREFIX,
+    uploadUrl: VITE_GLOB_UPLOAD_URL,
+    configurationPrefix: VITE_GLOB_CONFIGURATION,
+    largeDesignerPrefix: VITE_GLOB_LARGE_DESIGNER,
+    socketUrl: VITE_GLOB_WEB_SOCKET,
+    securityPolicy: VITE_GLOB_CONTENT_SECURITY_POLICY,
+    alarmNotifyDuration: VITE_GLOB_ALARM_NOTIFY_DURATION,
+    alarmPollingInterval: VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
+    disabledTaskCenterExecuteIntervalUnitSecond:
+      VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
+  };
+  return glob as Readonly<GlobConfig>;
+};

-import type { GlobEnvConfig } from '/#/config';
-
-import { warn } from '/@/utils/log';
-import pkg from '../../package.json';
-import { getConfigFileName } from '../../build/getConfigFileName';
-
-export function getCommonStoragePrefix() {
-  const { VITE_GLOB_APP_SHORT_NAME } = getAppEnvConfig();
-  return `${VITE_GLOB_APP_SHORT_NAME}__${getEnv()}`.toUpperCase();
-}
-
-// Generate cache key according to version
-export function getStorageShortName() {
-  return `${getCommonStoragePrefix()}${`__${pkg.version}`}__`.toUpperCase();
-}
-
-export function getAppEnvConfig() {
-  const ENV_NAME = getConfigFileName(import.meta.env);
-
-  const ENV = (import.meta.env.DEV
-    ? // Get the global configuration (the configuration will be extracted independently when packaging)
-      (import.meta.env as unknown as GlobEnvConfig)
-    : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
-  const {
-    VITE_GLOB_APP_TITLE,
-    VITE_GLOB_API_URL,
-    VITE_GLOB_APP_SHORT_NAME,
-    VITE_GLOB_API_URL_PREFIX,
-    VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_CONFIGURATION,
-    VITE_GLOB_WEB_SOCKET,
-    VITE_GLOB_CONTENT_SECURITY_POLICY,
-    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
-    VITE_GLOB_ALARM_NOTIFY_DURATION,
-    VITE_GLOB_LARGE_DESIGNER,
-  } = ENV;
-
-  if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
-    warn(
-      `VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`
-    );
-  }
-
-  return {
-    VITE_GLOB_APP_TITLE,
-    VITE_GLOB_API_URL,
-    VITE_GLOB_APP_SHORT_NAME,
-    VITE_GLOB_API_URL_PREFIX,
-    VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_CONFIGURATION,
-    VITE_GLOB_WEB_SOCKET,
-    VITE_GLOB_CONTENT_SECURITY_POLICY,
-    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
-    VITE_GLOB_ALARM_NOTIFY_DURATION,
-    VITE_GLOB_LARGE_DESIGNER,
-  };
-}
-
-/**
- * @description: Development mode
- */
-export const devMode = 'development';
-
-/**
- * @description: Production mode
- */
-export const prodMode = 'production';
-
-/**
- * @description: Get environment variables
- * @returns:
- * @example:
- */
-export function getEnv(): string {
-  return import.meta.env.MODE;
-}
-
-/**
- * @description: Is it a development mode
- * @returns:
- * @example:
- */
-export function isDevMode(): boolean {
-  return import.meta.env.DEV;
-}
-
-/**
- * @description: Is it a production mode
- * @returns:
- * @example:
- */
-export function isProdMode(): boolean {
-  return import.meta.env.PROD;
-}
+import type { GlobEnvConfig } from '/#/config';
+
+import { warn } from '/@/utils/log';
+import pkg from '../../package.json';
+import { getConfigFileName } from '../../build/getConfigFileName';
+
+export function getCommonStoragePrefix() {
+  const { VITE_GLOB_APP_SHORT_NAME } = getAppEnvConfig();
+  return `${VITE_GLOB_APP_SHORT_NAME}__${getEnv()}`.toUpperCase();
+}
+
+// Generate cache key according to version
+export function getStorageShortName() {
+  return `${getCommonStoragePrefix()}${`__${pkg.version}`}__`.toUpperCase();
+}
+
+export function getAppEnvConfig() {
+  const ENV_NAME = getConfigFileName(import.meta.env);
+
+  const ENV = (import.meta.env.DEV
+    ? // Get the global configuration (the configuration will be extracted independently when packaging)
+      (import.meta.env as unknown as GlobEnvConfig)
+    : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
+  const {
+    VITE_GLOB_APP_TITLE,
+    VITE_GLOB_API_URL,
+    VITE_GLOB_APP_SHORT_NAME,
+    VITE_GLOB_API_URL_PREFIX,
+    VITE_GLOB_UPLOAD_URL,
+    VITE_GLOB_CONFIGURATION,
+    VITE_GLOB_WEB_SOCKET,
+    VITE_GLOB_CONTENT_SECURITY_POLICY,
+    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
+    VITE_GLOB_ALARM_NOTIFY_DURATION,
+    VITE_GLOB_LARGE_DESIGNER,
+    VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
+  } = ENV;
+
+  if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
+    warn(
+      `VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`
+    );
+  }
+
+  return {
+    VITE_GLOB_APP_TITLE,
+    VITE_GLOB_API_URL,
+    VITE_GLOB_APP_SHORT_NAME,
+    VITE_GLOB_API_URL_PREFIX,
+    VITE_GLOB_UPLOAD_URL,
+    VITE_GLOB_CONFIGURATION,
+    VITE_GLOB_WEB_SOCKET,
+    VITE_GLOB_CONTENT_SECURITY_POLICY,
+    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
+    VITE_GLOB_ALARM_NOTIFY_DURATION,
+    VITE_GLOB_LARGE_DESIGNER,
+    VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
+  };
+}
+
+/**
+ * @description: Development mode
+ */
+export const devMode = 'development';
+
+/**
+ * @description: Production mode
+ */
+export const prodMode = 'production';
+
+/**
+ * @description: Get environment variables
+ * @returns:
+ * @example:
+ */
+export function getEnv(): string {
+  return import.meta.env.MODE;
+}
+
+/**
+ * @description: Is it a development mode
+ * @returns:
+ * @example:
+ */
+export function isDevMode(): boolean {
+  return import.meta.env.DEV;
+}
+
+/**
+ * @description: Is it a production mode
+ * @returns:
+ * @example:
+ */
+export function isProdMode(): boolean {
+  return import.meta.env.PROD;
+}

@@ -4,6 +4,7 @@ import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
 import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
+import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 useComponentRegister('JSONEditor', JSONEditor);
 
 export enum TypeEnum {
@@ -113,7 +114,9 @@ export const step1Schemas: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入设备标识',
     },
-    ifShow: ({ values }) => values?.transportType === TransportTypeEnum.TCP,
+    ifShow: ({ values }) =>
+      values?.transportType === TransportTypeEnum.TCP &&
+      values.deviceType === DeviceTypeEnum.SENSOR,
   },
   {
     field: 'brand',

@@ -198,7 +198,6 @@
       async function nextStep() {
         try {
           let values = await validate();
-          console.log(values);
           values = { devicePic: devicePic.value, ...positionState, ...values };
           delete values.icon;
           delete values.deviceAddress;

@@ -258,6 +258,7 @@ export const step2Schemas: FormSchema[] = [
           { label: 'LWM2M', value: 'LWM2M' },
           { label: 'SNMP', value: 'SNMP' },
         ],
+        getPopupContainer: () => document.body,
       };
     },
     colProps: { span: 10 },

@@ -607,9 +607,10 @@ export const actionSchema: FormSchema[] = [
       span: 6,
     },
     componentProps: ({ formModel, formActionType }) => {
-      const { updateSchema } = formActionType;
+      const { updateSchema, setFieldsValue } = formActionType;
       const deviceProfileId = Reflect.get(formModel, 'deviceProfileId');
       const thingsModelId = Reflect.get(formModel, 'thingsModelId');
+      const transportType = Reflect.get(formModel, 'transportType');
       return {
         placeholder: '请选择服务',
         api: async (params: Recordable) => {
@@ -640,12 +641,16 @@ export const actionSchema: FormSchema[] = [
         onChange: (_, options: ModelOfMatterParams) => {
           if (options) {
             // setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
-            updateSchema({
-              field: 'serviceInputValue',
-              componentProps: {
-                inputData: options.functionJson.inputData,
-              },
-            });
+            transportType === TransportTypeEnum.TCP
+              ? setFieldsValue({
+                  tcpServiceCommand: options.functionJson?.inputData?.[0]?.serviceCommand,
+                })
+              : updateSchema({
+                  field: 'serviceInputValue',
+                  componentProps: {
+                    inputData: options.functionJson.inputData,
+                  },
+                });
           }
         },
       };
@@ -725,12 +730,22 @@ export const actionSchema: FormSchema[] = [
     slot: 'clearAlarm',
   },
   {
+    field: 'tcpServiceCommand',
+    component: 'Input',
+    label: '服务命令',
+    colProps: { span: 24 },
+    dynamicDisabled: true,
+    show: ({ values }) =>
+      values['thingsModelId'] && values['transportType'] === TransportTypeEnum.TCP,
+  },
+  {
     field: 'serviceInputValue',
     component: 'ObjectModelValidateForm',
     label: '',
     changeEvent: 'update:value',
     valueField: 'value',
-    show: ({ values }) => values['thingsModelId'],
+    show: ({ values }) =>
+      values['thingsModelId'] && values['transportType'] !== TransportTypeEnum.TCP,
     colProps: {
       span: 24,
     },

@@ -94,7 +94,7 @@
 
 <script lang="ts">
   import { defineComponent } from 'vue';
-  import { isNumber } from '/@/utils/is';
+  import { isNumber, isObject, isString } from '/@/utils/is';
   import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
   export default defineComponent({
     components: {
@@ -272,12 +272,11 @@
     const isTCPTransportType = value.transportType === TransportTypeEnum.TCP;
     const doContext = unref(jsonInstance)?.get() || {};
     const serviceInputValue = Reflect.get(value, 'serviceInputValue');
-
     return {
       ...value,
       ...(Number(value.commandType) === CommandTypeEnum.CUSTOM
         ? { doContext: isTCPTransportType ? value.doContext : doContext }
-        : { doContext: serviceInputValue }),
+        : { doContext: isTCPTransportType ? value.tcpServiceCommand : serviceInputValue }),
       clearRule,
     };
   };
@@ -291,7 +290,10 @@
         ? { commandType: String(fieldsValue.commandType) }
         : {}),
       ...(commandType === CommandTypeEnum.SERVICE
-        ? { serviceInputValue: doContext.params || {} }
+        ? {
+            serviceInputValue: isObject(doContext.params) ? doContext.params : {},
+            tcpServiceCommand: isString(doContext.params) ? doContext.params : '',
+          }
         : { doContext: doContext.params }),
     });
   };

@@ -10,14 +10,17 @@ import { PollCommandInput, ModeEnum } from '../PollCommandInput';
 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
-import { TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
+import { BooleanStringEnum, TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
 import { dateUtil } from '/@/utils/dateUtil';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
+import { useGlobSetting } from '/@/hooks/setting';
 
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('PollCommandInput', PollCommandInput);
 
+const { disabledTaskCenterExecuteIntervalUnitSecond } = useGlobSetting();
+
 export enum FormFieldsEnum {
   // 任务名称
   NAME = 'name',
@@ -338,13 +341,21 @@ export const formSchemas: FormSchema[] = [
     component: 'RadioGroup',
     label: '时间单位',
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.POLL,
-    defaultValue: TimeUnitEnum.SECOND,
-    componentProps: {
-      options: [
-        { label: TimeUnitNameEnum.SECOND, value: TimeUnitEnum.SECOND },
+    defaultValue:
+      disabledTaskCenterExecuteIntervalUnitSecond === BooleanStringEnum.TRUE
+        ? TimeUnitEnum.MINUTE
+        : TimeUnitEnum.SECOND,
+    componentProps: () => {
+      const options = [
         { label: TimeUnitNameEnum.MINUTE, value: TimeUnitEnum.MINUTE },
         { label: TimeUnitNameEnum.HOUR, value: TimeUnitEnum.HOUR },
-      ],
+      ];
+      if (disabledTaskCenterExecuteIntervalUnitSecond === BooleanStringEnum.FALSE) {
+        options.unshift({ label: TimeUnitNameEnum.SECOND, value: TimeUnitEnum.SECOND });
+      }
+      return {
+        options,
+      };
     },
   },
   {

-import { MenuTypeEnum, MenuModeEnum, TriggerEnum, MixSidebarTriggerEnum } from '/@/enums/menuEnum';
-import {
-  ContentEnum,
-  PermissionModeEnum,
-  ThemeEnum,
-  RouterTransitionEnum,
-  SettingButtonPositionEnum,
-  SessionTimeoutProcessingEnum,
-} from '/@/enums/appEnum';
-
-import { CacheTypeEnum } from '/@/enums/cacheEnum';
-
-export type LocaleType = 'zh_CN' | 'en' | 'ru' | 'ja' | 'ko';
-
-export interface MenuSetting {
-  bgColor: string;
-  fixed: boolean;
-  collapsed: boolean;
-  canDrag: boolean;
-  show: boolean;
-  hidden: boolean;
-  split: boolean;
-  menuWidth: number;
-  mode: MenuModeEnum;
-  type: MenuTypeEnum;
-  theme: ThemeEnum;
-  topMenuAlign: 'start' | 'center' | 'end';
-  trigger: TriggerEnum;
-  accordion: boolean;
-  closeMixSidebarOnChange: boolean;
-  collapsedShowTitle: boolean;
-  mixSideTrigger: MixSidebarTriggerEnum;
-  mixSideFixed: boolean;
-}
-
-export interface MultiTabsSetting {
-  cache: boolean;
-  show: boolean;
-  showQuick: boolean;
-  canDrag: boolean;
-  showRedo: boolean;
-  showFold: boolean;
-}
-
-export interface HeaderSetting {
-  bgColor: string;
-  fixed: boolean;
-  show: boolean;
-  theme: ThemeEnum;
-  // Turn on full screen
-  showFullScreen: boolean;
-  // Whether to show the lock screen
-  useLockPage: boolean;
-  // Show document button
-  showDoc: boolean;
-  // Show message center button
-  showNotice: boolean;
-  showSearch: boolean;
-}
-
-export interface LocaleSetting {
-  showPicker: boolean;
-  // Current language
-  locale: LocaleType;
-  // default language
-  fallback: LocaleType;
-  // available Locales
-  availableLocales: LocaleType[];
-}
-
-export interface TransitionSetting {
-  //  Whether to open the page switching animation
-  enable: boolean;
-  // Route basic switching animation
-  basicTransition: RouterTransitionEnum;
-  // Whether to open page switching loading
-  openPageLoading: boolean;
-  // Whether to open the top progress bar
-  openNProgress: boolean;
-}
-
-export interface ProjectConfig {
-  // Storage location of permission related information
-  permissionCacheType: CacheTypeEnum;
-  // Whether to show the configuration button
-  showSettingButton: boolean;
-  // Whether to show the theme switch button
-  showDarkModeToggle: boolean;
-  // Configure where the button is displayed
-  settingButtonPosition: SettingButtonPositionEnum;
-  // Permission mode
-  permissionMode: PermissionModeEnum;
-  // Session timeout processing
-  sessionTimeoutProcessing: SessionTimeoutProcessingEnum;
-  // Website gray mode, open for possible mourning dates
-  grayMode: boolean;
-  // Whether to turn on the color weak mode
-  colorWeak: boolean;
-  // Theme color
-  themeColor: string;
-
-  // The main interface is displayed in full screen, the menu is not displayed, and the top
-  fullContent: boolean;
-  // content width
-  contentMode: ContentEnum;
-  // Whether to display the logo
-  showLogo: boolean;
-  // Whether to show the global footer
-  showFooter: boolean;
-  // menuType: MenuTypeEnum;
-  headerSetting: HeaderSetting;
-  // menuSetting
-  menuSetting: MenuSetting;
-  // Multi-tab settings
-  multiTabsSetting: MultiTabsSetting;
-  // Animation configuration
-  transitionSetting: TransitionSetting;
-  // pageLayout whether to enable keep-alive
-  openKeepAlive: boolean;
-  // Lock screen time
-  lockTime: number;
-  // Show breadcrumbs
-  showBreadCrumb: boolean;
-  // Show breadcrumb icon
-  showBreadCrumbIcon: boolean;
-  // Use error-handler-plugin
-  useErrorHandle: boolean;
-  // Whether to open back to top
-  useOpenBackTop: boolean;
-  // Is it possible to embed iframe pages
-  canEmbedIFramePage: boolean;
-  // Whether to delete unclosed messages and notify when switching the interface
-  closeMessageOnSwitch: boolean;
-  // Whether to cancel the http request that has been sent but not responded when switching the interface.
-  removeAllHttpPending: boolean;
-}
-
-export interface GlobConfig {
-  // Site title
-  title: string;
-  // Service interface url
-  apiUrl: string;
-  // Upload url
-  uploadUrl?: string;
-  //  Service interface url prefix
-  urlPrefix?: string;
-  // Project abbreviation
-  shortName: string;
-  // configuration center proxy prefix
-  configurationPrefix: string;
-  // large designer proxy prefix
-  largeDesignerPrefix: string;
-  // socket url
-  socketUrl: string;
-  // alarm notify alarm duration
-  alarmNotifyDuration: string;
-  // alarm notify polling interval
-  alarmPollingInterval: string;
-  // upgrade your http policy to https
-  securityPolicy: string;
-}
-export interface GlobEnvConfig {
-  // Site title
-  VITE_GLOB_APP_TITLE: string;
-  // Service interface url
-  VITE_GLOB_API_URL: string;
-  // Service interface url prefix
-  VITE_GLOB_API_URL_PREFIX?: string;
-  // Project abbreviation
-  VITE_GLOB_APP_SHORT_NAME: string;
-  // Upload url
-  VITE_GLOB_UPLOAD_URL?: string;
-  // configuration
-  VITE_GLOB_CONFIGURATION: string;
-  // large designer
-  VITE_GLOB_LARGE_DESIGNER: string;
-  // socket
-  VITE_GLOB_WEB_SOCKET: string;
-  // force transform http to https
-  VITE_GLOB_CONTENT_SECURITY_POLICY: string;
-  // notify polling interval time
-  VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME: string;
-  // notify duration
-  VITE_GLOB_ALARM_NOTIFY_DURATION: string;
-}
+import { MenuTypeEnum, MenuModeEnum, TriggerEnum, MixSidebarTriggerEnum } from '/@/enums/menuEnum';
+import {
+  ContentEnum,
+  PermissionModeEnum,
+  ThemeEnum,
+  RouterTransitionEnum,
+  SettingButtonPositionEnum,
+  SessionTimeoutProcessingEnum,
+} from '/@/enums/appEnum';
+
+import { CacheTypeEnum } from '/@/enums/cacheEnum';
+
+export type LocaleType = 'zh_CN' | 'en' | 'ru' | 'ja' | 'ko';
+
+export interface MenuSetting {
+  bgColor: string;
+  fixed: boolean;
+  collapsed: boolean;
+  canDrag: boolean;
+  show: boolean;
+  hidden: boolean;
+  split: boolean;
+  menuWidth: number;
+  mode: MenuModeEnum;
+  type: MenuTypeEnum;
+  theme: ThemeEnum;
+  topMenuAlign: 'start' | 'center' | 'end';
+  trigger: TriggerEnum;
+  accordion: boolean;
+  closeMixSidebarOnChange: boolean;
+  collapsedShowTitle: boolean;
+  mixSideTrigger: MixSidebarTriggerEnum;
+  mixSideFixed: boolean;
+}
+
+export interface MultiTabsSetting {
+  cache: boolean;
+  show: boolean;
+  showQuick: boolean;
+  canDrag: boolean;
+  showRedo: boolean;
+  showFold: boolean;
+}
+
+export interface HeaderSetting {
+  bgColor: string;
+  fixed: boolean;
+  show: boolean;
+  theme: ThemeEnum;
+  // Turn on full screen
+  showFullScreen: boolean;
+  // Whether to show the lock screen
+  useLockPage: boolean;
+  // Show document button
+  showDoc: boolean;
+  // Show message center button
+  showNotice: boolean;
+  showSearch: boolean;
+}
+
+export interface LocaleSetting {
+  showPicker: boolean;
+  // Current language
+  locale: LocaleType;
+  // default language
+  fallback: LocaleType;
+  // available Locales
+  availableLocales: LocaleType[];
+}
+
+export interface TransitionSetting {
+  //  Whether to open the page switching animation
+  enable: boolean;
+  // Route basic switching animation
+  basicTransition: RouterTransitionEnum;
+  // Whether to open page switching loading
+  openPageLoading: boolean;
+  // Whether to open the top progress bar
+  openNProgress: boolean;
+}
+
+export interface ProjectConfig {
+  // Storage location of permission related information
+  permissionCacheType: CacheTypeEnum;
+  // Whether to show the configuration button
+  showSettingButton: boolean;
+  // Whether to show the theme switch button
+  showDarkModeToggle: boolean;
+  // Configure where the button is displayed
+  settingButtonPosition: SettingButtonPositionEnum;
+  // Permission mode
+  permissionMode: PermissionModeEnum;
+  // Session timeout processing
+  sessionTimeoutProcessing: SessionTimeoutProcessingEnum;
+  // Website gray mode, open for possible mourning dates
+  grayMode: boolean;
+  // Whether to turn on the color weak mode
+  colorWeak: boolean;
+  // Theme color
+  themeColor: string;
+
+  // The main interface is displayed in full screen, the menu is not displayed, and the top
+  fullContent: boolean;
+  // content width
+  contentMode: ContentEnum;
+  // Whether to display the logo
+  showLogo: boolean;
+  // Whether to show the global footer
+  showFooter: boolean;
+  // menuType: MenuTypeEnum;
+  headerSetting: HeaderSetting;
+  // menuSetting
+  menuSetting: MenuSetting;
+  // Multi-tab settings
+  multiTabsSetting: MultiTabsSetting;
+  // Animation configuration
+  transitionSetting: TransitionSetting;
+  // pageLayout whether to enable keep-alive
+  openKeepAlive: boolean;
+  // Lock screen time
+  lockTime: number;
+  // Show breadcrumbs
+  showBreadCrumb: boolean;
+  // Show breadcrumb icon
+  showBreadCrumbIcon: boolean;
+  // Use error-handler-plugin
+  useErrorHandle: boolean;
+  // Whether to open back to top
+  useOpenBackTop: boolean;
+  // Is it possible to embed iframe pages
+  canEmbedIFramePage: boolean;
+  // Whether to delete unclosed messages and notify when switching the interface
+  closeMessageOnSwitch: boolean;
+  // Whether to cancel the http request that has been sent but not responded when switching the interface.
+  removeAllHttpPending: boolean;
+}
+
+export interface GlobConfig {
+  // Site title
+  title: string;
+  // Service interface url
+  apiUrl: string;
+  // Upload url
+  uploadUrl?: string;
+  //  Service interface url prefix
+  urlPrefix?: string;
+  // Project abbreviation
+  shortName: string;
+  // configuration center proxy prefix
+  configurationPrefix: string;
+  // large designer proxy prefix
+  largeDesignerPrefix: string;
+  // socket url
+  socketUrl: string;
+  // alarm notify alarm duration
+  alarmNotifyDuration: string;
+  // alarm notify polling interval
+  alarmPollingInterval: string;
+  // upgrade your http policy to https
+  securityPolicy: string;
+  // Should Disabled Task Center Execute Interval Unit (Second)
+  disabledTaskCenterExecuteIntervalUnitSecond: string;
+}
+export interface GlobEnvConfig {
+  // Site title
+  VITE_GLOB_APP_TITLE: string;
+  // Service interface url
+  VITE_GLOB_API_URL: string;
+  // Service interface url prefix
+  VITE_GLOB_API_URL_PREFIX?: string;
+  // Project abbreviation
+  VITE_GLOB_APP_SHORT_NAME: string;
+  // Upload url
+  VITE_GLOB_UPLOAD_URL?: string;
+  // configuration
+  VITE_GLOB_CONFIGURATION: string;
+  // large designer
+  VITE_GLOB_LARGE_DESIGNER: string;
+  // socket
+  VITE_GLOB_WEB_SOCKET: string;
+  // force transform http to https
+  VITE_GLOB_CONTENT_SECURITY_POLICY: string;
+  // notify polling interval time
+  VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME: string;
+  // notify duration
+  VITE_GLOB_ALARM_NOTIFY_DURATION: string;
+  // Should Disabled Task Center Execute Interval Unit (Second)
+  VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND: string;
+}