Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into fix/rule-chain-field

@@ -14,6 +14,8 @@
   import { OpenModalMode, OpenModalParams, StructRecord } from './type';
   import { cloneDeep } from 'lodash-es';
   import { isArray } from '/@/utils/is';
+  import { FormField } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
   const emit = defineEmits(['update:value']);
 
@@ -53,7 +55,10 @@
   const handleUpdate = (value: StructRecord) => {
     openModal(true, {
       mode: OpenModalMode.UPDATE,
-      record: value,
+      record: {
+        ...value,
+        [FormField.HAS_STRUCT_FROM]: value?.dataType?.type === DataTypeEnum.STRUCT,
+      },
     } as OpenModalParams);
   };
 
@@ -90,15 +95,10 @@
           <div>参数名称: {{ item.functionName }}</div>
           <div class="flex">
             <Button class="!p-0" type="link" @click="handleUpdate(item)">
-              <span>{{ $props.disabled ? '查看' : '编辑' }}</span>
+              <span>{{ disabled ? '查看' : '编辑' }}</span>
             </Button>
             <Divider type="vertical" />
-            <Button
-              :disabled="$props.disabled"
-              class="!p-0"
-              type="link"
-              @click="handleDelete(item)"
-            >
+            <Button :disabled="disabled" class="!p-0" type="link" @click="handleDelete(item)">
               <span>删除</span>
             </Button>
           </div>
@@ -114,7 +114,7 @@
     <StructFormModel
       :has-struct-form="hasStructForm!"
       :hidden-access-mode="hiddenAccessMode"
-      :disabled="$props.disabled"
+      :disabled="disabled"
       :value-list="getValue"
       @register="registerModal"
       @submit="handleSaveStruct"

@@ -8,7 +8,7 @@
   import { formSchemas } from './config';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { OpenModalMode, OpenModalParams, StructRecord } from './type';
-  import { ref, unref } from 'vue';
+  import { computed, ref, unref } from 'vue';
   import { transfromToStructJSON } from './util';
   import { cloneDeep } from 'lodash-es';
   import { DataType, StructJSON } from '/@/api/device/model/modelOfMatterModel';
@@ -32,7 +32,6 @@
 
   const [register, { validate, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
-    schemas: formSchemas(props.hasStructForm, props.hiddenAccessMode),
     actionColOptions: {
       span: 14,
     },
@@ -42,6 +41,14 @@
     showActionButtonGroup: false,
   });
 
+  const getFormSchemas = computed(() => {
+    const { hasStructForm, hiddenAccessMode } = props;
+    return formSchemas({
+      hasStructForm,
+      hiddenAccessMode,
+    });
+  });
+
   const [registerModal, { closeModal }] = useModalInner((record: OpenModalParams) => {
     modalReceiveRecord.value = record;
     const data = record.record || {};
@@ -97,7 +104,7 @@
     destroy-on-close
     :show-ok-btn="!$props.disabled"
   >
-    <BasicForm @register="register" />
+    <BasicForm @register="register" :schemas="getFormSchemas" />
   </BasicModal>
 </template>
 

@@ -21,11 +21,17 @@ export const validateJSON = (_rule, value = [] as ModelOfMatterParams[], _callba
   return Promise.reject('JSON对象不能为空');
 };
 
-export const formSchemas = (
-  hasStructForm: boolean,
-  hiddenAccessMode: boolean,
-  isTcp = false
-): FormSchema[] => {
+interface StructFormSchemasParmasType {
+  hasStructForm: boolean;
+  hiddenAccessMode: boolean;
+  isTcp?: boolean;
+}
+
+export const formSchemas = ({
+  hasStructForm,
+  hiddenAccessMode,
+  isTcp = false,
+}: StructFormSchemasParmasType): FormSchema[] => {
   return [
     {
       field: FormField.FUNCTION_NAME,
@@ -54,6 +60,12 @@ export const formSchemas = (
       },
     },
     {
+      field: FormField.HAS_STRUCT_FROM,
+      label: '是否已存在结构体',
+      component: 'Input',
+      ifShow: false,
+    },
+    {
       field: FormField.TYPE,
       label: '数据类型',
       required: true,
@@ -63,7 +75,7 @@ export const formSchemas = (
       },
       defaultValue: 'INT',
       componentProps: ({ formActionType }) => {
-        const { updateSchema, setFieldsValue } = formActionType;
+        const { setFieldsValue } = formActionType;
         return {
           placeholder: '请选择数据类型',
           api: async (params: Recordable) => {
@@ -84,13 +96,7 @@ export const formSchemas = (
           getPopupContainer: () => document.body,
           onChange: (value: string) => {
             if (value == DataTypeEnum.STRUCT) {
-              updateSchema({
-                field: FormField.SPECS_LIST,
-                componentProps: {
-                  hasStructForm: true,
-                },
-              });
-              setFieldsValue({ [FormField.SPECS_LIST]: [] });
+              setFieldsValue({ [FormField.SPECS_LIST]: [], [FormField.HAS_STRUCT_FROM]: true });
             }
           },
         };
@@ -316,6 +322,11 @@ export const formSchemas = (
       colProps: { span: 24 },
       ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.STRUCT,
       rules: [{ required: true, validator: validateJSON }],
+      componentProps: ({ formModel }) => {
+        return {
+          hasStructForm: formModel[FormField.HAS_STRUCT_FROM],
+        };
+      },
     },
     {
       field: FormField.REFARK,

@@ -147,7 +147,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'enableTemplate', //前端控制
-    label: '启用模版',
+    label: '启用模板',
     component: 'Switch',
     defaultValue: 0,
     componentProps: ({ formActionType }) => {

@@ -62,7 +62,7 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'name',
-    label: '模板',
+    label: '模板名称',
     component: 'Input',
     colProps: { span: 8 },
     componentProps: {

@@ -25,7 +25,7 @@
   const [register, { reload }] = useCardList({
     api: getPage,
     useSearchForm: true,
-    title: '模版',
+    title: '模板列表',
     gutter: 4,
     formConfig: {
       schemas: searchFormSchema,

@@ -58,7 +58,7 @@
     },
     selections: {
       beforeSelectValidate: (record: ProfileRecord) => {
-        return !record.default;
+        return !record.default && record?.name !== 'default';
       },
       onSelect: (_record, _flag, allSelecteds) => {
         disabledDeleteFlag.value = !allSelecteds.length;
@@ -188,7 +188,7 @@
                   popconfirm: {
                     title: '是否确认删除操作?',
                     onConfirm: handleDelete.bind(null, [item.id]),
-                    disabled: item.default,
+                    disabled: item.default || item.name == 'default',
                   },
                   disabled: item.default || item.name == 'default',
                 },

@@ -5,48 +5,27 @@
     destroyOnClose
     v-bind="$attrs"
     width="25rem"
+    :min-height="150"
     @register="register"
     @cancel="handleCancel"
     :showOkBtn="false"
   >
-    <div class="w-full h-full" ref="loadingRef">
-      <div class="flex justify-end">
-        <Button @click="handleTemplateDownload" type="link">excel模板下载</Button>
-      </div>
-      <div class="flex justify-evenly items-center h-50 !w-full">
-        <Upload
-          accept=".json,"
-          :show-upload-list="false"
-          :customRequest="handleImportModel"
-          class="flex justify-center items-center"
-        >
-          <div class="flex flex-col justify-center items-center">
-            <Tooltip>
-              <template #title>请使用从物模型TSL导出的JSON文件在进行导入</template>
-              <img :src="JSONImage" alt="avatar" class="w-20 h-20" />
-            </Tooltip>
-          </div>
-        </Upload>
-        <Upload
-          accept=".csv,.xls,.xlsx"
-          :show-upload-list="false"
-          :customRequest="handleCSVImport"
-          class="flex justify-center items-center"
-        >
-          <div class="flex flex-col justify-center items-center">
-            <Tooltip>
-              <template #title>请使用下载的模板编辑之后在进行导入</template>
-              <img :src="CSVImage" alt="avatar" class="w-20 h-20" />
-            </Tooltip>
-          </div>
-        </Upload>
-      </div>
-    </div>
+    <BasicForm @register="registerForm">
+      <template #importType="{ model }">
+        <RadioGroup v-model:value="model.importType">
+          <Radio value="2">JSON导入</Radio>
+          <Radio value="1">Excel导入</Radio>
+        </RadioGroup>
+        <div v-if="model.importType === '1'" class="absolute -left-28">
+          <Button @click="handleTemplateDownload" type="link">excel模板下载</Button>
+        </div>
+      </template>
+    </BasicForm>
   </BasicModal>
 </template>
 <script lang="ts" setup>
   import { ref, unref } from 'vue';
-  import { Upload, Tooltip, Button } from 'ant-design-vue';
+  import { Button, Radio, RadioGroup } from 'ant-design-vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -59,8 +38,7 @@
     excelExport,
   } from '/@/api/device/modelOfMatter';
   import { useLoading } from '/@/components/Loading';
-  import JSONImage from '/@/assets/svg/JSON.svg';
-  import CSVImage from '/@/assets/svg/excel.svg';
+  import { BasicForm, useForm } from '/@/components/Form';
 
   const emits = defineEmits(['register', 'handleImportCSV', 'handleReload']);
 
@@ -85,6 +63,48 @@
   const [register, { closeModal }] = useModalInner(async (data) => {
     ImportInfo.value = data;
   });
+
+  const [registerForm, {}] = useForm({
+    schemas: [
+      {
+        field: 'importType',
+        label: '导入类型',
+        component: 'RadioGroup',
+        defaultValue: '2',
+        slot: 'importType',
+        helpMessage:
+          'JSON导入请使用从物模型TSL导出的JSON文件在进行导入,Excel导入请使用下载的模板编辑之后在进行导入',
+        required: true,
+      },
+      {
+        field: 'apiId',
+        label: '',
+        component: 'ApiUpload',
+        componentProps: ({ formModel }) => {
+          return {
+            maxFileLimit: 1,
+            accept: formModel.importType == 2 ? '.json,' : '.csv,.xls,.xlsx',
+            api: async (file: File) => {
+              try {
+                if (formModel.importType == 2) {
+                  handleImportModel(file);
+                } else {
+                  handleCSVImport(file);
+                }
+                return {
+                  uid: '',
+                  name: '',
+                };
+              } catch {}
+            },
+          };
+        },
+      },
+    ],
+    labelWidth: 100,
+    showActionButtonGroup: false,
+  });
+
   // 导入loading
   const importLoading = ref(false);
 
@@ -101,7 +121,7 @@
   };
 
   // JSON导入
-  const handleImportModel = async (data: { file: File }) => {
+  const handleImportModel = async (file: File) => {
     const fileReader = new FileReader();
     const { isCateGory, id } = unref(ImportInfo);
 
@@ -148,11 +168,11 @@
       }
     };
 
-    fileReader.readAsText(data.file, 'utf-8');
+    fileReader.readAsText(file, 'utf-8');
   };
 
   // CSV导入
-  const handleCSVImport = async ({ file }) => {
+  const handleCSVImport = async (file) => {
     const { isCateGory, id } = unref(ImportInfo);
 
     try {
@@ -200,4 +220,8 @@
   };
 </script>
 
-<style lang="less" scope></style>
+<style lang="less" scoped>
+  :deep(.ant-form-item) {
+    margin-bottom: 28px !important;
+  }
+</style>

@@ -14,12 +14,17 @@
   import { OpenModelMode } from '../types';
   import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import { TransportTypeEnum } from '../../../../components/TransportDescript/const';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
   const props = defineProps<{ openModalMode: OpenModelMode; transportType?: string | undefined }>();
 
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
-    schemas: formSchemas(false, false, props.transportType === TransportTypeEnum.TCP),
+    schemas: formSchemas({
+      hasStructForm: false,
+      hiddenAccessMode: false,
+      isTcp: props.transportType === TransportTypeEnum.TCP,
+    }),
     actionColOptions: {
       span: 14,
     },
@@ -67,7 +72,9 @@
       ...functionJson,
       ...dataType,
       ...(isArray(specs) ? specs : { ...specs }),
+      hasStructForm: (record?.functionJson?.dataType as DataType)?.type === DataTypeEnum.STRUCT,
     };
+
     setFieldsValue(value);
   };
 

@@ -3,13 +3,15 @@
 </template>
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form';
-  import { serviceSchemas } from './config';
+  import { FormField, serviceSchemas } from './config';
   import { FunctionType } from './config';
   import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
   import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { excludeIdInStructJSON } from '/@/components/Form/src/externalCompns/components/StructForm/util';
   import { OpenModelMode } from '../types';
+  import { isArray } from '/@/utils/is';
+  import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
   const props = defineProps<{
     record: DeviceRecord;
@@ -48,6 +50,14 @@
       serviceCommand,
       callType,
     };
+
+    if (
+      isArray(inputData) &&
+      inputData.find((item) => item?.dataType?.type === DataTypeEnum.STRUCT)
+    ) {
+      Reflect.set(value, FormField.HAS_STRUCT_FROM, true);
+    }
+
     setFieldsValue(value);
   };
 

@@ -28,6 +28,8 @@ export enum FormField {
   REGISTER_ADDRESS = 'registerAddress',
   EXTENSION_DESC = 'extensionDesc',
   STRUCT = 'struct',
+
+  HAS_STRUCT_FROM = 'hasStructForm',
 }
 
 export enum FunctionType {
@@ -125,6 +127,12 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       },
     },
     {
+      field: FormField.HAS_STRUCT_FROM,
+      component: 'Input',
+      label: '是否已存在结构体',
+      ifShow: false,
+    },
+    {
       field: FormField.INPUT_PARAM,
       label: '输入参数',
       component: 'StructForm',
@@ -133,8 +141,11 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       rules: [{ message: '输入参数为必填项', required: true, type: 'array' }],
       ifShow: !tcpDeviceFlag,
       colProps: { span: 24 },
-      componentProps: {
-        hiddenAccessMode: true,
+      componentProps: ({ formModel }) => {
+        return {
+          hiddenAccessMode: true,
+          hasStructForm: formModel[FormField.HAS_STRUCT_FROM],
+        };
       },
     },
     {

@@ -185,8 +185,8 @@ export const list = [
   {
     deviceType: '网关/直连/网关子设备',
     function: '事件上报',
-    release: 'v1/devices/event/${deviceId}/${identifier}',
-    subscribe: 'v1/devices/event/${deviceId}/${identifier}',
+    release: 'v1/devices/event/${deviceId}||${deviceName}/${identifier}',
+    subscribe: 'v1/devices/event/${deviceId}||${deviceName}/${identifier}',
     platform: '订阅',
     device: '发布',
   },