Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…

…eat/device-new-protocol

@@ -8,7 +8,7 @@ VITE_GLOB_PUBLIC_PATH = /
 # 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地址
 VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -9,6 +9,7 @@
     "clazz",
     "Cmds",
     "COAP",
+    "drawio",
     "echarts",
     "edrx",
     "EFENTO",

@@ -8,6 +8,8 @@ export interface ConfigurationCenterItemsModal {
   remark: string;
   publicId?: string;
   organizationId?: string;
+  platform?: string;
+  productIds?: string;
 }
 export type queryPageParams = BasicPageParams & {
   name?: Nullable<string>;

@@ -45,7 +45,7 @@ enum DeviceManagerApi {
   DEVICE_PUBLIC = '/customer/public/device',
 
   DEVICE_PRIVATE = '/customer/device',
-  DEVICE_COLLECT = '/device/collect ', //收藏
+  DEVICE_COLLECT = '/collect/DEVICE_COLLECT', //收藏
 
   /**
    * @description 通过设备列表获取设备信息
@@ -62,7 +62,7 @@ export const devicePage = (params: DeviceQueryParam) => {
   });
 };
 
-export const deviceCollect = (params: Array<any>) => {
+export const deviceCollect = (params: string[]) => {
   return defHttp.post({
     url: `${DeviceManagerApi.DEVICE_COLLECT}`,
     params,

 import { StructJSON } from './modelOfMatterModel';
 import { BasicPageParams } from '/@/api/model/baseModel';
-import { AlarmStatus } from '/@/views/alarm/log/config/detail.config';
+import { AlarmStatus } from '/@/enums/alarmEnum';
 import { DeviceStatusEnum } from '/@/views/rule/dataFlow/cpns/config';
 export enum DeviceState {
   INACTIVE = 'INACTIVE',

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

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

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

@@ -17,6 +17,7 @@
           icon="ion:document-text-outline"
         />
         <MenuItem
+          v-if="hasPermission('system:password:view')"
           key="changePassword"
           :text="t('layout.header.dropdownItemChangePassword')"
           icon="ant-design:unlock-twotone"

@@ -279,20 +279,20 @@
             ref="listEl"
             :loading="loading"
             :data-source="cameraList"
-            class="bg-light-50 w-full h-full dark:bg-dark-900 split-mode-list"
+            class="bg-light-50 w-full !h-full dark:bg-dark-900 split-mode-list"
             :grid="(gridLayout as any)"
             :style="{ '--height': `${100 / pagination.colNumber}%` }"
           >
             <template #renderItem="{ item }">
               <List.Item>
-                <div class="box-border w-full h-full p-1px">
+                <div class="box-border w-full !h-full p-1px">
                   <div
                     v-if="item.placeholder"
-                    class="bg-black w-full h-full overflow-hidden relative"
+                    class="bg-black w-full !h-full overflow-hidden relative"
                   ></div>
                   <div
                     v-if="!item.placeholder"
-                    class="bg-black w-full h-full overflow-hidden relative video-container"
+                    class="bg-black w-full !h-full overflow-hidden relative video-container"
                   >
                     <Spin
                       class="!absolute top-1/2 left-1/2 transform -translate-1/2"
@@ -333,7 +333,7 @@
   }
 
   .split-screen-mode:deep(.ant-spin-container) {
-    height: 100%;
+    height: 100% !important;
   }
 
   .video-container {

@@ -4,6 +4,7 @@ import { createImgPreview } from '/@/components/Preview';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 import { useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+import { getDeviceProfile } from '/@/api/alarm/position';
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 export enum Platform {
@@ -136,6 +137,28 @@ export const formSchema: FormSchema[] = [
     component: 'OrgTreeSelect',
   },
   {
+    field: 'isTemplate',
+    label: '模版',
+    component: 'Switch',
+    defaultValue: 0,
+    componentProps: {
+      checkedValue: 1,
+      unCheckedValue: 0,
+    },
+  },
+  {
+    field: 'productIds',
+    label: '产品',
+    component: 'ApiSelect',
+    required: true,
+    componentProps: {
+      api: getDeviceProfile,
+      mode: 'multiple',
+      labelField: 'name',
+      valueField: 'tbProfileId',
+    },
+  },
+  {
     field: 'platform',
     label: '平台',
     required: true,

+import { Platform } from './center.data';
+import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal';
+import { useGlobSetting } from '/@/hooks/setting';
+
+export enum ScadaModeEnum {
+  LIGHTBOX = 'lightbox',
+  DESIGN = 'design',
+  SHARE = 'share',
+}
+
+interface ScadaLinkParamsType {
+  configurationId: string;
+  organizationId: string;
+  mode: ScadaModeEnum;
+  platform: Platform;
+  publicId?: string;
+}
+
+const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
+
+export const encode = (record: Recordable) => {
+  let hash = JSON.stringify(record);
+  const mixinString = getRandomString()
+    .slice(0, 10)
+    .padEnd(10, getRandomString())
+    .split('')
+    .map((item) => (Math.random() > 0.5 ? item.toUpperCase() : item))
+    .join('');
+  hash = window.btoa(hash);
+  hash = hash.substring(0, 6) + mixinString + hash.substring(6);
+  hash = window.btoa(hash);
+  return hash;
+};
+
+export const createScadaPageLink = (
+  record: ConfigurationCenterItemsModal,
+  mode: ScadaModeEnum = ScadaModeEnum.DESIGN,
+  open = true
+) => {
+  const { configurationPrefix } = useGlobSetting();
+  const params: ScadaLinkParamsType = {
+    configurationId: record.id,
+    organizationId: record.organizationId!,
+    mode: mode,
+    platform: record.platform as Platform,
+  };
+
+  if (mode === ScadaModeEnum.SHARE) {
+    params.publicId = record.publicId;
+  }
+
+  const href = new URL(location.origin);
+  href.pathname = configurationPrefix;
+  href.hash = encode(params);
+  open && window.open(href.href);
+  return href.href;
+};

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

@@ -16,54 +16,33 @@
       </div>
     </div>
     <div class="mt-8">
-      <a-row type="flex" align="top">
-        <a-col
-          :span="
-            method === RequestMethodTypeEnum.WEBSOCKET
-              ? 11
-              : httpType === RequestHttpTypeEnum.POST
-              ? 6
-              : 6
-          "
-        >
+      <div class="flex">
+        <div>
           <p>过滤器函数编写：</p>
-          <AceTypeIsJsEditor
-            :restData="getRestData"
-            @changeAceContent="onHandleAceContent"
-            ref="aceTypeIsJsEditorRef"
-          />
-        </a-col>
-        <a-col :span="1">
-          <a-divider type="vertical" class="divider-color" />
-        </a-col>
-        <a-col
-          :span="
-            method === RequestMethodTypeEnum.WEBSOCKET
-              ? 12
-              : httpType === RequestHttpTypeEnum.POST
-              ? 17
-              : 17
-          "
-          style="position: relative"
-          :style="{
-            left:
-              (method === RequestMethodTypeEnum.WEBSOCKET
-                ? 1.5
-                : httpType === RequestHttpTypeEnum.POST
-                ? -0.25
-                : 0) + 'vw',
-          }"
-        >
-          <a-col>
+          <div class="w-90">
+            <AceTypeIsJsEditor
+              :restData="getRestData"
+              @changeAceContent="onHandleAceContent"
+              ref="aceTypeIsJsEditorRef"
+            />
+          </div>
+        </div>
+        <div><a-divider type="vertical" class="divider-color" /></div>
+        <div class="flex flex-col ml-8">
+          <div>
             <p>接口返回数据(res)：</p>
-            <JsonEditor style="height: 35vh" :showBtn="true" ref="jsonEditorRef" />
-          </a-col>
-          <a-col class="mt-3">
+            <div>
+              <JsonEditor class="w-100 h-100" :showBtn="true" ref="jsonEditorRef" />
+            </div>
+          </div>
+          <div class="mt-4">
             <p>过滤器结果：</p>
-            <JsonFilterEditor style="height: 35vh" :showBtn="true" ref="jsonEditorFilterRef" />
-          </a-col>
-        </a-col>
-      </a-row>
+            <div>
+              <JsonFilterEditor class="w-100 h-100" :showBtn="true" ref="jsonEditorFilterRef" />
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -78,7 +57,7 @@
   import AceTypeIsJsEditor from '../../SimpleRequest/components/aceEditor.vue';
   import { Tag } from 'ant-design-vue';
   import { useThrottleFn } from '@vueuse/shared';
-  import { RequestMethodTypeEnum, RequestHttpTypeEnum } from '../../../config/enum';
+  import { RequestMethodTypeEnum } from '../../../config/enum';
 
   const emits = defineEmits(['emitExcute']);
 
@@ -334,9 +313,9 @@
   }
 
   .divider-color {
-    height: 78.5vh;
+    height: 54rem;
     background-color: #e5e7eb;
     position: relative;
-    left: 1.16vw;
+    left: 1rem;
   }
 </style>

@@ -99,7 +99,7 @@ export const descSchema = (emit: EmitType): DescItem[] => {
 export const realTimeDataColumns: BasicColumn[] = [
   {
     title: '键',
-    dataIndex: 'key',
+    dataIndex: 'name',
     width: 100,
   },
   {

@@ -175,7 +175,10 @@
                     label: '取消收藏',
                     auth: 'api:yt:device:online:record',
                     icon: 'ant-design:heart-outlined',
-                    onClick: handelCollect.bind(null, record),
+                    popConfirm: {
+                      title: '是否取消收藏',
+                      confirm: handelCollect.bind(null, record),
+                    },
                   },
               {
                 label: '删除',
@@ -305,6 +308,7 @@
         columns,
         beforeFetch: (params) => {
           const { deviceProfileId } = params;
+          if (!deviceProfileId) return;
           const obj = {
             ...params,
             ...{

@@ -106,7 +106,7 @@ export const defaultSchemas: FormSchema[] = [
         getPopupContainer: () => document.body,
       };
     },
-    colProps: useGridLayout(2, 2, 2, 2, 2, 2) as unknown as ColEx,
+    colProps: useGridLayout(1.5, 1.5, 1.5, 1.5, 1.5, 1.5) as unknown as ColEx,
   },
   {
     field: SchemaFiled.AGG,

@@ -260,6 +260,7 @@
         },
         beforeFetch: (params) => {
           const { deviceProfileId } = params;
+          if (!deviceProfileId) return;
           const deviceProfileIds = [deviceProfileId];
           const obj = {
             ...params,

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

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

@@ -12,6 +12,8 @@
   import { sendSms } from '/@/api/message/template';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { phoneRule } from '/@/utils/rules';
+  import { PlateFormTypeEnum } from './template.data';
+
   const schemas: FormSchema[] = [
     {
       field: 'id',
@@ -142,7 +144,38 @@
           field: 'params',
           componentProps: {
             placeholder:
-              platformType.value !== 'TENCENT_CLOUD' ? '示例：{"code":"1234"}' : '示例：["123456"]',
+              platformType.value !== PlateFormTypeEnum.tencent_cound
+                ? '示例：{"code":"1234"}'
+                : '示例：["123456"]',
+          },
+          dynamicRules: () => {
+            return [
+              {
+                required: true,
+                validator: (_, value) => {
+                  try {
+                    if (typeof value == 'object') {
+                      return Promise.resolve();
+                    } else {
+                      if (typeof JSON.parse(value) == 'object') {
+                        return Promise.resolve();
+                      }
+                      return Promise.reject(
+                        platformType.value !== PlateFormTypeEnum.tencent_cound
+                          ? '请输入JSON格式例如{"code":"1234"}'
+                          : '请输入这种格式["123456"]'
+                      );
+                    }
+                  } catch {
+                    return Promise.reject(
+                      platformType.value !== PlateFormTypeEnum.tencent_cound
+                        ? '请输入JSON格式例如{"code":"1234"}'
+                        : '请输入这种格式["123456"]'
+                    );
+                  }
+                },
+              },
+            ];
           },
         });
         await resetFields();
@@ -154,7 +187,7 @@
       async function handleOK() {
         let smsParams: any = null;
         const values = await validate();
-        if (platformType.value === 'TENCENT_CLOUD') {
+        if (platformType.value === PlateFormTypeEnum.tencent_cound) {
           //腾讯云发送格式 将字符串转为数组
           smsParams = {
             tencent_param: JSON.parse(Reflect.get(values, 'params')),

@@ -4,6 +4,11 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { findMessageConfig } from '/@/api/message/config';
 import { isMessage } from '/@/views/message/config/config.data';
 
+export enum PlateFormTypeEnum {
+  ali_cound = 'ALI_CLOUD',
+  tencent_cound = 'TENCENT_CLOUD',
+}
+
 export const columns: BasicColumn[] = [
   {
     title: '模板名称',
@@ -223,47 +228,33 @@ export const formSchema: FormSchema[] = [
     helpMessage: [],
     componentProps({ formActionType }) {
       const { updateSchema } = formActionType;
+      updateSchema({
+        field: 'templatePurpose',
+        helpMessage: [
+          `登录模板平台提供如下参数:
+          {
+            "code":"验证码"
+          }。`,
+          `忘记密码模板平台提供如下参数:
+          {
+            "code":"验证码"
+          }。`,
+          `告警通知模板平台提供如下参数:
+          {
+            "organization":"设备所属组织",
+            "deviceName":"设备名称",
+            "severity":"告警等级",
+            "type":"告警类型",
+            "triggerValue":"触发值",
+            "createTime":"告警时间"
+          }。`,
+          `清除密码模板平台提供如下参数:
+          {
+            "code":"验证码"
+          }。`,
+        ],
+      });
       return {
-        onChange(value) {
-          if (value === 'FOR_LOGIN') {
-            updateSchema({
-              field: 'templatePurpose',
-              helpMessage: `登录模板平台提供如下参数:
-              {
-                "code":"验证码"
-              }`,
-            });
-          } else if (value === 'FOR_FORGET_PASSWORD') {
-            updateSchema({
-              field: 'templatePurpose',
-              helpMessage: `忘记密码模板平台提供如下参数:
-              {
-                "code":"验证码"
-              }`,
-            });
-          } else if (value === 'FOR_ALARM_NOTICE') {
-            updateSchema({
-              field: 'templatePurpose',
-              helpMessage: `告警通知模板平台提供如下参数:
-              {
-                "type":"告警类型",
-                "deviceName":"设备名称",
-                "severity":"告警等级",
-                "organization":"设备所属组织",
-                "createTime":"告警时间",
-                "triggerValue":"触发值",
-              }`,
-            });
-          } else if (value === 'FOR_SET_PASSWORD') {
-            updateSchema({
-              field: 'templatePurpose',
-              helpMessage: `清除密码模板平台提供如下参数:
-              {
-                "code":"验证码"
-              }`,
-            });
-          }
-        },
         api: findDictItemByCode,
         params: {
           dictCode: 'template_purpose',

@@ -86,12 +86,12 @@ export enum OriginatorTelemetryFieldsEnum {
 }
 
 export enum OriginatorTelemetryFieldsNameEnum {
-  LATEST_TS_KEY_NAMES = 'Latest timeseries',
+  LATEST_TS_KEY_NAMES = 'Timeseries key',
   AGGREGATION = '数据聚合功能',
   FETCH_MODE = 'Fetch Mode',
   ORDER_BY = 'Order by',
   LIMIT = 'Limit',
-  USE_METADATA_INTERVAL_PATTERNS = 'useMetadataIntervalPatterns',
+  USE_METADATA_INTERVAL_PATTERNS = 'Use interval patterns',
   START_INTERVAL = 'Start Interval',
   START_INTERVAL_TIME_UNIT = 'Start Interval Time Unit',
   END_INTERVAL = 'End Interval',

@@ -73,6 +73,10 @@ export const formSchemas: FormSchema[] = [
       getPopupContainer: () => document.body,
       placeholder: `请选择${RestApiCallFieldsEnum.PROXY_SCHEME}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_HOST,
@@ -83,6 +87,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_PORT,
@@ -93,6 +101,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_USER,
@@ -101,6 +113,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_USER}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_PASSWORD,
@@ -109,6 +125,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_PASSWORD}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.READ_TIMEOUT_MS,

@@ -229,7 +229,7 @@ export const trigger_condition_schema: FormSchema[] = [
         placeholder: '请选择类型',
         labelField: 'itemText',
         valueField: 'itemValue',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         onChange(e) {
           if (e) {
             setFieldsValue({ deviceProfileId: '' });
@@ -256,7 +256,7 @@ export const trigger_condition_schema: FormSchema[] = [
         placeholder: '请选择产品',
         labelField: 'name',
         valueField: 'id',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         onChange: async (e) => {
           if (e) {
             setFieldsValue({ type2: '', entityId: [] });
@@ -315,7 +315,7 @@ export const trigger_condition_schema: FormSchema[] = [
           return [];
         },
         placeholder: '请选择设备',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
           let { label, value } = option;
           label = label.toLowerCase();
@@ -450,7 +450,7 @@ export const actionSchema: FormSchema[] = [
         placeholder: '请选择类型',
         labelField: 'itemText',
         valueField: 'itemValue',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         onChange(e) {
           if (e) {
             setFieldsValue({ deviceProfileId: '' });
@@ -482,7 +482,7 @@ export const actionSchema: FormSchema[] = [
         placeholder: '请选择产品',
         labelField: 'name',
         valueField: 'id',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         onChange: (_value: string, options = {} as DeviceProfileModel) => {
           const oldType = formModel['transportType'];
 
@@ -556,7 +556,7 @@ export const actionSchema: FormSchema[] = [
           return [];
         },
         placeholder: '请选择设备',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
       };
     },
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
@@ -593,7 +593,7 @@ export const actionSchema: FormSchema[] = [
           dictCode: 'custom_define',
         },
         numberToString: true,
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         onChange: () => {
           setFieldsValue({ doContext: null, thingsModelId: null });
         },
@@ -619,7 +619,7 @@ export const actionSchema: FormSchema[] = [
       },
       labelField: 'itemText',
       valueField: 'itemValue',
-      getPopupContainer: () => document.body,
+      getPopupContainer: (triggerNode) => triggerNode.parentNode,
     },
     ifShow: ({ values }) =>
       isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.commandType),
@@ -688,7 +688,7 @@ export const actionSchema: FormSchema[] = [
         },
         labelField: 'functionName',
         valueField: 'id',
-        getPopupContainer: () => document.body,
+        getPopupContainer: (triggerNode) => triggerNode.parentNode,
         onChange: (_, options: ModelOfMatterParams) => {
           if (options) {
             // setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });

@@ -148,6 +148,7 @@
     { value: 'DEFAULT', label: '默认' },
     { value: 'SYSTEM', label: '系统' },
     { value: 'REPORT', label: '报表' },
+    { value: 'TASK_CENTER', label: '任务中心' },
   ]);
   const optionStatus: any = ref([
     { value: '1 ', label: '成功' },

@@ -45,7 +45,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -24,6 +24,18 @@
         label: '文本字体大小',
         component: 'InputNumber',
         defaultValue: 14,
+        componentProps: {
+          min: 0,
+          max: 100,
+          formatter: (e) => {
+            const value = e?.toString().replace(/^0/g, '');
+            if (value) {
+              return value.replace(/^0/g, '');
+            } else {
+              return 0;
+            }
+          },
+        },
       },
       {
         field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,

@@ -36,7 +36,19 @@
         field: ComponentConfigFieldEnum.FONT_SIZE,
         label: '文本字体大小',
         component: 'InputNumber',
-        defaultValue: option.fontSize,
+        defaultValue: 14,
+        componentProps: {
+          min: 0,
+          max: 100,
+          formatter: (e) => {
+            const value = e?.toString().replace(/^0/g, '');
+            if (value) {
+              return value.replace(/^0/g, '');
+            } else {
+              return 0;
+            }
+          },
+        },
       },
       {
         field: ComponentConfigFieldEnum.PASS_WORD,

@@ -22,7 +22,19 @@
         field: ComponentConfigFieldEnum.FONT_SIZE,
         label: '文本字体大小',
         component: 'InputNumber',
-        defaultValue: option.fontSize,
+        defaultValue: 14,
+        componentProps: {
+          min: 0,
+          max: 100,
+          formatter: (e) => {
+            const value = e?.toString().replace(/^0/g, '');
+            if (value) {
+              return value.replace(/^0/g, '');
+            } else {
+              return 0;
+            }
+          },
+        },
       },
       {
         field: ComponentConfigFieldEnum.PASS_WORD,

@@ -18,7 +18,19 @@
         field: ComponentConfigFieldEnum.VALUE_SIZE,
         label: '数值字体大小',
         component: 'InputNumber',
-        defaultValue: option.fontSize,
+        defaultValue: 14,
+        componentProps: {
+          min: 0,
+          max: 100,
+          formatter: (e) => {
+            const value = e?.toString().replace(/^0/g, '');
+            if (value) {
+              return value.replace(/^0/g, '');
+            } else {
+              return 0;
+            }
+          },
+        },
       },
       {
         field: ComponentConfigFieldEnum.TEXT_COLOR,

@@ -30,7 +30,19 @@
         field: ComponentConfigFieldEnum.FONT_SIZE,
         label: '文本字体大小',
         component: 'InputNumber',
-        defaultValue: option.fontSize,
+        defaultValue: 14,
+        componentProps: {
+          min: 0,
+          max: 100,
+          formatter: (e) => {
+            const value = e?.toString().replace(/^0/g, '');
+            if (value) {
+              return value.replace(/^0/g, '');
+            } else {
+              return 0;
+            }
+          },
+        },
       },
       {
         field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,

@@ -58,7 +58,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -76,7 +76,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -64,7 +64,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -82,7 +82,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -2,6 +2,7 @@
   import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
   import { useForm, BasicForm } from '/@/components/Form';
   import { PublicFormInstaceType } from '/@/views/visual/dataSourceBindPanel/index.type';
+  import { nextTick } from 'vue';
 
   const [register, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
     schemas: [
@@ -28,7 +29,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -58,7 +58,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -76,7 +76,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -72,7 +72,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -90,7 +90,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -51,7 +51,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -69,7 +69,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -62,7 +62,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -80,7 +80,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -85,7 +85,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -103,7 +103,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -33,7 +33,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -55,7 +55,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -28,7 +28,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -45,7 +45,7 @@
         componentProps: {
           min: 0,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -28,7 +28,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -46,7 +46,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -33,7 +33,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -51,7 +51,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -32,7 +32,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -50,7 +50,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -34,7 +34,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -52,7 +52,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {

@@ -32,7 +32,7 @@
         componentProps: {
           min: 0,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {
@@ -50,7 +50,7 @@
           min: 0,
           max: 100,
           formatter: (e) => {
-            const value = e.replace(/^0/g, '');
+            const value = e?.toString().replace(/^0/g, '');
             if (value) {
               return value.replace(/^0/g, '');
             } else {