Merge branch 'main_dev' into 'v1.4.0_dev'

Main dev See merge request yunteng/thingskit-front!1339

Merge branch 'main_dev' into 'v1.4.0_dev'
Main dev See merge request yunteng/thingskit-front!1339
xp.Huang
2 parents f2a9d875 d43a6e0b
Showing 10 changed files with 86 additions and 28 deletions
.env.development
.env.production
build/script/buildConf.ts
src/hooks/setting/index.ts
src/hooks/web/useWebSecurityPolicy.ts
src/utils/env.ts
src/views/camera/manage/config.data.ts
src/views/device/list/cpns/tabs/VideoChannel/index.vue
src/views/device/profiles/components/ObjectModelForm/StructFormItem/CreateStructModal.vue
types/config.d.ts
--- a/.env.development
View file @e6d1944
+++ b/.env.development
View file @e6d1944
@@ -34,6 +34,9 @@ VITE_GLOB_LARGE_DESIGNER = /large-designer
 # Content Security Policy
 VITE_GLOB_CONTENT_SECURITY_POLICY = false
+# Streaming media content security protocol
+VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL = true
+
 # Alarm Notify Polling Interval Time
 VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 500000
--- a/.env.production
View file @e6d1944
+++ b/.env.production
View file @e6d1944
@@ -46,6 +46,9 @@ VITE_GLOB_LARGE_DESIGNER = /large-designer
 # Content Security Policy
 VITE_GLOB_CONTENT_SECURITY_POLICY = false
+# Streaming media content security protocol
+VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL = false
+
 # Alarm Notify Polling Interval Time
 VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 60000
--- a/build/script/buildConf.ts
View file @e6d1944
+++ b/build/script/buildConf.ts
View file @e6d1944
@@ -10,6 +10,30 @@ import { getConfigFileName } from '../getConfigFileName';
 import pkg from '../../package.json';
+const stringToJSONParse = (string: string) => {
+  try {
+    return JSON.parse(string);
+  } catch (error) {
+    return string;
+  }
+};
+
+export function parseEnv(env: Record<string, string>) {
+  const res: Record<string, string> = {};
+
+  Object.keys(env).forEach((key) => {
+    try {
+      const value = env[key];
+      res[key] = stringToJSONParse(value);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.log(`env variable ${key} can't serialization!`);
+    }
+  });
+
+  return res;
+}
+
 function createConfig(
   {
     configName,
@@ -20,7 +44,7 @@ function createConfig(
   try {
     const windowConf = `window.${configName}`;
     // Ensure that the variable will not be modified
-    const configStr = `${windowConf}=${JSON.stringify(config)};
+    const configStr = `${windowConf}=${JSON.stringify(parseEnv(config))};
       Object.freeze(${windowConf});
       Object.defineProperty(window, "${configName}", {
         configurable: false,
@@ -30,9 +54,12 @@ function createConfig(
     fs.mkdirp(getRootPath(OUTPUT_DIR));
     writeFileSync(getRootPath(`${OUTPUT_DIR}/${configFileName}`), configStr);
+    // eslint-disable-next-line no-console
     console.log(chalk.cyan(`✨ [${pkg.name}]`) + ` - configuration file is build successfully:`);
+    // eslint-disable-next-line no-console
     console.log(chalk.gray(OUTPUT_DIR + '/' + chalk.green(configFileName)) + '\n');
   } catch (error) {
+    // eslint-disable-next-line no-console
     console.log(chalk.red('configuration file configuration file failed to package:\n' + error));
   }
 }
--- a/src/hooks/setting/index.ts
View file @e6d1944
+++ b/src/hooks/setting/index.ts
View file @e6d1944
@@ -18,6 +18,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     VITE_GLOB_LARGE_DESIGNER,
     VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
     VITE_GLOB_SOFTWARE_VERSION_NUMBER,
+    VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL,
   } = getAppEnvConfig();
   if (!/[a-zA-Z\_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -36,12 +37,14 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     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,
+    securityPolicy: VITE_GLOB_CONTENT_SECURITY_POLICY as unknown as boolean,
+    alarmNotifyDuration: VITE_GLOB_ALARM_NOTIFY_DURATION as unknown as number,
+    alarmPollingInterval: VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME as unknown as number,
     disabledTaskCenterExecuteIntervalUnitSecond:
-      VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
+      VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND as unknown as boolean,
     softwareVersionNumber: VITE_GLOB_SOFTWARE_VERSION_NUMBER,
+    streamMediaContentSecurityProtocol:
+      VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL as unknown as boolean,
   };
   return glob as Readonly<GlobConfig>;
 };
--- a/src/hooks/web/useWebSecurityPolicy.ts
View file @e6d1944
+++ b/src/hooks/web/useWebSecurityPolicy.ts
View file @e6d1944
@@ -4,7 +4,7 @@ let initialFlag = false;
 export function useWebSecurityPolicy() {
   if (window && window.document && window.document.documentElement) {
     const { securityPolicy } = useGlobSetting();
-    if (securityPolicy === 'true' && !initialFlag) {
+    if (securityPolicy && !initialFlag) {
       const meta = document.createElement('meta');
       meta.setAttribute('http-equiv', 'Content-Security-Policy');
       meta.setAttribute('content', 'upgrade-insecure-requests');
--- a/src/utils/env.ts
View file @e6d1944
+++ b/src/utils/env.ts
View file @e6d1944
@@ -14,13 +14,38 @@ export function getStorageShortName() {
   return `${getCommonStoragePrefix()}${`__${pkg.version}`}__`.toUpperCase();
 }
+const stringToJSONParse = (string: string) => {
+  try {
+    return JSON.parse(string);
+  } catch (error) {
+    return string;
+  }
+};
+
+export function parseEnv(env: Record<string, string>) {
+  const res: Record<string, string> = {};
+
+  Object.keys(env).forEach((key) => {
+    try {
+      const value = env[key];
+      res[key] = stringToJSONParse(value);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.log(`env variable ${key} can't serialization!`);
+    }
+  });
+
+  return res;
+}
+
 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)
+      (parseEnv(import.meta.env as Record<string, string>) as unknown as GlobEnvConfig)
     : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
+
   const {
     VITE_GLOB_APP_TITLE,
     VITE_GLOB_API_URL,
@@ -35,6 +60,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_LARGE_DESIGNER,
     VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
     VITE_GLOB_SOFTWARE_VERSION_NUMBER,
+    VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL,
   } = ENV;
   if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -57,6 +83,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_LARGE_DESIGNER,
     VITE_GLOB_DISABLED_TASK_CENTER_EXECUTE_INTERVAL_UNIT_SECOND,
     VITE_GLOB_SOFTWARE_VERSION_NUMBER,
+    VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL,
   };
 }
--- a/src/views/camera/manage/config.data.ts
View file @e6d1944
+++ b/src/views/camera/manage/config.data.ts
View file @e6d1944
@@ -25,8 +25,6 @@ import { useFingerprint } from '/@/utils/useFingerprint';
 import { getVideoControlStart } from '/@/api/device/videoChannel';
 import { StreamType as PlayerStreamType } from '/@/components/Video/src/types';
 import { useGlobSetting } from '/@/hooks/setting';
-import { BooleanStringEnum } from '/@/enums/toolEnum';
-import { isBoolean } from '/@/utils/is';
 interface FileItem {
   uid: string;
@@ -645,11 +643,9 @@ export async function getPlayUrl(
   } else if (accessMode === AccessMode.GBT28181) {
     const { deviceId, channelNo } = params?.params || {};
     const result = await getVideoControlStart({ channelId: channelNo!, deviceId: deviceId! });
-    const { securityPolicy } = useGlobSetting();
+    const { streamMediaContentSecurityProtocol } = useGlobSetting();
     return {
-      url: (isBoolean(securityPolicy) ? securityPolicy : securityPolicy === BooleanStringEnum.TRUE)
-        ? result.data.https_flv
-        : result.data.flv,
+      url: !!streamMediaContentSecurityProtocol ? result.data.https_flv : result.data.flv,
       type: 'flv',
     };
   } else {
--- a/src/views/device/list/cpns/tabs/VideoChannel/index.vue
View file @e6d1944
+++ b/src/views/device/list/cpns/tabs/VideoChannel/index.vue
View file @e6d1944
@@ -59,8 +59,6 @@
   import { Authority } from '/@/components/Authority';
   import { VideoChannelItemType } from '/@/api/device/model/videoChannelModel';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { BooleanStringEnum } from '/@/enums/toolEnum';
-  import { isBoolean } from '/@/utils/is';
   const props = defineProps<{ deviceDetail: DeviceRecord }>();
@@ -112,14 +110,10 @@
         getPlayUrl: async () => {
           const { deviceId, channelId } = record;
           const result = await getVideoControlStart({ deviceId, channelId });
-          const { securityPolicy } = useGlobSetting();
+          const { streamMediaContentSecurityProtocol } = useGlobSetting();
           return {
             type: 'flv',
-            url: (
-              isBoolean(securityPolicy) ? securityPolicy : securityPolicy === BooleanStringEnum.TRUE
-            )
-              ? result.data.https_flv
-              : result.data.flv,
+            url: !!streamMediaContentSecurityProtocol ? result.data.https_flv : result.data.flv,
           };
         },
       } as VideoCancelModalParamsType,
--- a/src/views/device/profiles/components/ObjectModelForm/StructFormItem/CreateStructModal.vue
View file @e6d1944
+++ b/src/views/device/profiles/components/ObjectModelForm/StructFormItem/CreateStructModal.vue
View file @e6d1944
@@ -38,15 +38,16 @@
   const handleValidateHasSameIdentifier = (formValue?: StructJSON) => {
     const { identifier } = formValue || {};
     const message = '存在一致的标识符';
-
     if (unref(currentMode) === DataActionModeEnum.CREATE) {
       if (props.value.filter((item) => item.identifier === identifier).length >= 1) {
         createMessage.warn(message);
         return Promise.reject(message);
       }
     } else {
-      const index = props.value.findIndex((item) => item.identifier === formValue?.identifier);
-      if (index !== unref(currentEditIndex)) {
+      const list = [...props.value];
+      list.splice(unref(currentEditIndex), 1, formValue!);
+      const existLength = list.filter((item) => item?.identifier === formValue?.identifier).length;
+      if (existLength > 1) {
         createMessage.warn(message);
         return Promise.reject(message);
       }
--- a/types/config.d.ts
View file @e6d1944
+++ b/types/config.d.ts
View file @e6d1944
@@ -153,13 +153,15 @@ export interface GlobConfig {
   // socket url
   socketUrl: string;
   // alarm notify alarm duration
-  alarmNotifyDuration: string;
+  alarmNotifyDuration: number;
   // alarm notify polling interval
-  alarmPollingInterval: string;
+  alarmPollingInterval: number;
   // upgrade your http policy to https
-  securityPolicy: string;
+  securityPolicy: boolean;
+  // Streaming media content security protocol
+  streamMediaContentSecurityProtocol: boolean;
   // Should Disabled Task Center Execute Interval Unit (Second)
-  disabledTaskCenterExecuteIntervalUnitSecond: string;
+  disabledTaskCenterExecuteIntervalUnitSecond: boolean;
   // Software version number
   softwareVersionNumber: string;
 }
@@ -182,6 +184,8 @@ export interface GlobEnvConfig {
   VITE_GLOB_WEB_SOCKET: string;
   // force transform http to https
   VITE_GLOB_CONTENT_SECURITY_POLICY: string;
+  // Streaming media content security protocol
+  VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL: string;
   // notify polling interval time
   VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME: string;
   // notify duration