Merge branch 'perf/things-model' into 'main_dev'

Perf/things model

See merge request yunteng/thingskit-front!964

@@ -8,7 +8,7 @@ VITE_GLOB_PUBLIC_PATH = /
 # Please note that no line breaks
 # Please note that no line breaks
 
 
 # 本地
 # 本地
-VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
+VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
 VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
 VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -22,9 +22,11 @@
       value: ModelOfMatterParams[];
       value: ModelOfMatterParams[];
       disabled: boolean;
       disabled: boolean;
       hasStructForm?: boolean;
       hasStructForm?: boolean;
+      hiddenAccessMode?: boolean;
     }>(),
     }>(),
     {
     {
       value: () => [],
       value: () => [],
+      hiddenAccessMode: false,
       hasStructForm: false,
       hasStructForm: false,
     }
     }
   );
   );
@@ -106,11 +108,12 @@
         <span class="mr-2">
         <span class="mr-2">
           <PlusOutlined />
           <PlusOutlined />
         </span>
         </span>
-        <span @click="!$props.disabled && handleCreateParams()">增加参数</span>
+        <span @click="!disabled && handleCreateParams()">增加参数</span>
       </div>
       </div>
     </div>
     </div>
     <StructFormModel
     <StructFormModel
-      :has-struct-form="$props.hasStructForm!"
+      :has-struct-form="hasStructForm!"
+      :hidden-access-mode="hiddenAccessMode"
       :disabled="$props.disabled"
       :disabled="$props.disabled"
       :value-list="getValue"
       :value-list="getValue"
       @register="registerModal"
       @register="registerModal"

@@ -23,6 +23,7 @@
     disabled: boolean;
     disabled: boolean;
     hasStructForm: boolean;
     hasStructForm: boolean;
     valueList: StructRecord[];
     valueList: StructRecord[];
+    hiddenAccessMode: boolean;
   }>();
   }>();
 
 
   const emit = defineEmits(['register', 'submit']);
   const emit = defineEmits(['register', 'submit']);
@@ -31,7 +32,7 @@
 
 
   const [register, { validate, setFieldsValue, setProps }] = useForm({
   const [register, { validate, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
-    schemas: formSchemas(props.hasStructForm),
+    schemas: formSchemas(props.hasStructForm, props.hiddenAccessMode),
     actionColOptions: {
     actionColOptions: {
       span: 14,
       span: 14,
     },
     },

@@ -28,7 +28,11 @@ export const validateJSON = (_rule, value = [] as ModelOfMatterParams[], _callba
   return Promise.reject('JSON对象不能为空');
   return Promise.reject('JSON对象不能为空');
 };
 };
 
 
-export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] => {
+export const formSchemas = (
+  hasStructForm: boolean,
+  hiddenAccessMode: boolean,
+  isTcp = false
+): FormSchema[] => {
   return [
   return [
     {
     {
       field: FormField.FUNCTION_NAME,
       field: FormField.FUNCTION_NAME,
@@ -299,7 +303,7 @@ export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[]
       colProps: {
       colProps: {
         span: 24,
         span: 24,
       },
       },
-      ifShow: () => !hasStructForm,
+      ifShow: () => !hiddenAccessMode && !hasStructForm,
       defaultValue: 'r',
       defaultValue: 'r',
       componentProps: {
       componentProps: {
         placeholder: '请选择读写类型',
         placeholder: '请选择读写类型',

@@ -14,12 +14,14 @@
   import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
   import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { isDevMode } from '/@/utils/env';
   import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
   import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import configurationSrc from '/@/assets/icons/configuration.svg';
   import configurationSrc from '/@/assets/icons/configuration.svg';
   import { cloneDeep } from 'lodash';
   import { cloneDeep } from 'lodash';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { usePermission } from '/@/hooks/web/usePermission';
+  import { useGlobSetting } from '/@/hooks/setting';
   import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
   import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ShareModal } from '/@/views/common/ShareModal';
@@ -29,7 +31,6 @@
   import { useRole } from '/@/hooks/business/useRole';
   import { useRole } from '/@/hooks/business/useRole';
   import { useClipboard } from '@vueuse/core';
   import { useClipboard } from '@vueuse/core';
   import { Icon } from '/@/components/Icon';
   import { Icon } from '/@/components/Icon';
-  import { createScadaPageLink, ScadaModeEnum } from './help';
 
 
   const listColumn = ref(5);
   const listColumn = ref(5);
 
 
@@ -129,15 +130,25 @@
     }
     }
   };
   };
 
 
+  const { configurationPrefix } = useGlobSetting();
+  const isDev = isDevMode();
+
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getPreviewFlag)) return;
     if (!unref(getPreviewFlag)) return;
-    createScadaPageLink(record, ScadaModeEnum.LIGHTBOX);
+    window.open(
+      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
+        record!.id
+      }&lightbox=1&organizationId=${record.organizationId}`
+    );
   };
   };
 
 
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getDesignFlag)) return;
     if (!unref(getDesignFlag)) return;
-
-    createScadaPageLink(record, ScadaModeEnum.DESIGN);
+    window.open(
+      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
+        record!.id
+      }&organizationId=${record.organizationId}`
+    );
   };
   };
 
 
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
@@ -154,7 +165,14 @@
   };
   };
 
 
   const createShareUrl = (record: ConfigurationCenterItemsModal) => {
   const createShareUrl = (record: ConfigurationCenterItemsModal) => {
-    return createScadaPageLink(record, ScadaModeEnum.SHARE, false);
+    const searchParams = new URLSearchParams();
+    isDev && searchParams.set('dev', '1');
+    searchParams.set('share', 'SCADA');
+    searchParams.set('configurationId', record.id);
+    searchParams.set('publicId', record.publicId || '');
+    searchParams.set('lightbox', '1');
+    searchParams.set('organizationId', record!.organizationId || '');
+    return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
   };
   };
 
 
   const { copied, copy } = useClipboard({ legacy: true });
   const { copied, copy } = useClipboard({ legacy: true });

@@ -19,7 +19,7 @@
 
 
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
-    schemas: formSchemas(false, props.transportType === TransportTypeEnum.TCP),
+    schemas: formSchemas(false, false, props.transportType === TransportTypeEnum.TCP),
     actionColOptions: {
     actionColOptions: {
       span: 14,
       span: 14,
     },
     },

@@ -143,6 +143,9 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       rules: [{ message: '输入参数为必填项', required: true, type: 'array' }],
       rules: [{ message: '输入参数为必填项', required: true, type: 'array' }],
       ifShow: !tcpDeviceFlag,
       ifShow: !tcpDeviceFlag,
       colProps: { span: 24 },
       colProps: { span: 24 },
+      componentProps: {
+        hiddenAccessMode: true,
+      },
     },
     },
     {
     {
       field: FormField.OUTPUT_PARAM,
       field: FormField.OUTPUT_PARAM,
@@ -151,6 +154,9 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       valueField: 'value',
       valueField: 'value',
       changeEvent: 'update:value',
       changeEvent: 'update:value',
       colProps: { span: 24 },
       colProps: { span: 24 },
+      componentProps: {
+        hiddenAccessMode: true,
+      },
     },
     },
     {
     {
       field: FormField.REFARK,
       field: FormField.REFARK,
@@ -218,6 +224,9 @@ export const eventSchemas: FormSchema[] = [
     valueField: 'value',
     valueField: 'value',
     changeEvent: 'update:value',
     changeEvent: 'update:value',
     colProps: { span: 24 },
     colProps: { span: 24 },
+    componentProps: {
+      hiddenAccessMode: true,
+    },
   },
   },
   {
   {
     field: FormField.REFARK,
     field: FormField.REFARK,