Merge branch 'perf/object-model-service-params-adjust' into 'main_dev'

fix: 服务下发时增加标识符下发 See merge request yunteng/thingskit-front!694

Merge branch 'perf/object-model-service-params-adjust' into 'main_dev'
fix: 服务下发时增加标识符下发 See merge request yunteng/thingskit-front!694
xp.Huang
2 parents e541d9c0 ac042c53
Showing 5 changed files with 88 additions and 9 deletions
src/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue
src/views/device/list/config/data.ts
src/views/device/list/cpns/tabs/CommandIssuance.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/cpns/action.vue
--- a/src/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue
View file @4aba0a5
+++ b/src/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue
View file @4aba0a5
@@ -12,6 +12,7 @@
       inputData?: StructJSON[];
       formProps?: FormProps;
       value?: Recordable;
+      required?: boolean;
     }>(),
     {
       inputData: () => [] as StructJSON[],
@@ -62,6 +63,10 @@
       component: 'InputNumber',
       rules: [
         {
+          required: props.required,
+          message: `${functionName}是必填项`,
+        },
+        {
           type: 'number',
           trigger: 'change',
           validator: (_rule, value) => {
@@ -100,6 +105,10 @@
       component: 'Input',
       rules: [
         {
+          required: props.required,
+          message: `${functionName}是必填项`,
+        },
+        {
           type: 'string',
           trigger: 'change',
           validator: (_rule, value) => {
@@ -125,6 +134,12 @@
       field: identifier,
       label: functionName,
       component: 'Select',
+      rules: [
+        {
+          required: props.required,
+          message: `${functionName}是必填项`,
+        },
+      ],
       componentProps: {
         options: [
           { label: `${boolClose}-0`, value: 0 },
@@ -142,6 +157,12 @@
       field: identifier,
       label: functionName,
       component: 'InputTextArea',
+      rules: [
+        {
+          required: props.required,
+          message: `${functionName}是必填项`,
+        },
+      ],
       componentProps: {
         onChange: (value: InputEvent) => {
           syncValue(identifier, (value.target as HTMLInputElement).value);
--- a/src/views/device/list/config/data.ts
View file @4aba0a5
+++ b/src/views/device/list/config/data.ts
View file @4aba0a5
@@ -867,7 +867,7 @@ export const CommandSchemas = (
               return [];
             }
           },
-          valueField: 'id',
+          valueField: 'identifier',
           labelField: 'functionName',
           getPopupContainer: () => document.body,
           onChange(value: string, options: ModelOfMatterParams) {
--- a/src/views/device/list/cpns/tabs/CommandIssuance.vue
View file @4aba0a5
+++ b/src/views/device/list/cpns/tabs/CommandIssuance.vue
View file @4aba0a5
@@ -77,6 +77,9 @@
                 ? field[CommandFieldsEnum.TCP_SERVICE]
                 : field[CommandFieldsEnum.MODEL_INPUT];
             command.additionalInfo = { cmdType: 1 };
+            command.params = {
+              [field[CommandFieldsEnum.SERVICE]]: command.params,
+            };
           }
           commandIssuanceApi(
--- a/src/views/rule/linkedge/config/config.data.ts
View file @4aba0a5
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @4aba0a5
@@ -17,6 +17,7 @@ import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+import { isArray } from '/@/utils/is';
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
@@ -597,7 +598,21 @@ export const actionSchema: FormSchema[] = [
     ifShow: ({ values }) =>
       isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.commandType),
   },
-  //新增代码2022-11-23
+  {
+    field: 'serviceIdentifier',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'thingsModelKeys',
+    label: '',
+    show: false,
+    component: 'Select',
+    componentProps: {
+      mode: 'multiple',
+    },
+  },
   {
     field: 'thingsModelId',
     label: '',
@@ -626,7 +641,14 @@ export const actionSchema: FormSchema[] = [
                   inputData: selected?.functionJson.inputData,
                 },
               });
-            selected && setFieldsValue({ callType: selected.callType });
+            selected &&
+              setFieldsValue({
+                callType: selected.callType,
+                serviceIdentifier: selected?.identifier,
+                thingsModelKeys: isArray(selected?.functionJson?.inputData)
+                  ? selected?.functionJson?.inputData.map((item) => item.identifier)
+                  : [],
+              });
             return record;
           } catch (error) {
             console.error(error);
@@ -642,7 +664,14 @@ export const actionSchema: FormSchema[] = [
         onChange: (_, options: ModelOfMatterParams) => {
           if (options) {
             // setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
-            const record = { callType: options.callType };
+            // if ( )
+            const record = {
+              callType: options.callType,
+              serviceIdentifier: options.identifier,
+              thingsModelKeys: isArray(options?.functionJson?.inputData)
+                ? options?.functionJson?.inputData.map((item) => item.identifier)
+                : [],
+            };
             transportType === TransportTypeEnum.TCP
               ? Object.assign(record, {
                   tcpServiceCommand: options.functionJson?.inputData?.[0]?.serviceCommand,
@@ -655,6 +684,8 @@ export const actionSchema: FormSchema[] = [
                 });
             setFieldsValue(record);
+          } else {
+            setFieldsValue({ serviceIdentifier: null });
           }
         },
       };
--- a/src/views/rule/linkedge/cpns/action.vue
View file @4aba0a5
+++ b/src/views/rule/linkedge/cpns/action.vue
View file @4aba0a5
@@ -94,7 +94,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
-  import { isNumber, isObject, isString } from '/@/utils/is';
+  import { isNullOrUnDef, isNumber, isObject, isString } from '/@/utils/is';
   import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
   export default defineComponent({
     components: {
@@ -110,7 +110,7 @@
   import { ref, onMounted, nextTick, unref, computed, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Tooltip, Select, Checkbox, Card, Input } from 'ant-design-vue';
+  import { Tooltip, Select, Checkbox, Card, Input, message } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
   import { actionSchema, CommandTypeEnum } from '../config/config.data';
   import jsoneditor from 'jsoneditor';
@@ -272,11 +272,31 @@
     const isTCPTransportType = value.transportType === TransportTypeEnum.TCP;
     const doContext = unref(jsonInstance)?.get() || {};
     const serviceInputValue = Reflect.get(value, 'serviceInputValue');
+
+    const getServiceIdentifier = Reflect.get(value, 'serviceIdentifier');
+
+    const isCustomCommand = Number(value.commandType) === CommandTypeEnum.CUSTOM;
+
+    const thingsModelKeys = Reflect.get(value, 'thingsModelKeys');
+
+    if (!isCustomCommand) {
+      for (const key of thingsModelKeys) {
+        if (isNullOrUnDef(serviceInputValue[key]) || '') {
+          message.warning('服务命令为必填项');
+          throw '';
+        }
+      }
+    }
+
     return {
       ...value,
-      ...(Number(value.commandType) === CommandTypeEnum.CUSTOM
+      ...(isCustomCommand
         ? { doContext: isTCPTransportType ? value.doContext : doContext }
-        : { doContext: isTCPTransportType ? value.tcpServiceCommand : serviceInputValue }),
+        : {
+            doContext: isTCPTransportType
+              ? value.serviceIdentifier
+              : { [getServiceIdentifier]: serviceInputValue },
+          }),
       clearRule,
     };
   };
@@ -284,6 +304,8 @@
   const setFieldsFormValueFun = (fieldsValue) => {
     const doContext = Reflect.get(fieldsValue, 'doContext');
     const commandType = Reflect.get(fieldsValue, 'commandType');
+    const getServiceIdentifier = Object.keys(doContext?.params || {})[0];
+
     setFieldsValue({
       ...fieldsValue,
       ...(isNumber(fieldsValue.commandType)
@@ -291,7 +313,9 @@
         : {}),
       ...(commandType === CommandTypeEnum.SERVICE
         ? {
-            serviceInputValue: isObject(doContext.params) ? doContext.params : {},
+            serviceInputValue: isObject(doContext.params)
+              ? doContext?.params?.[getServiceIdentifier] || {}
+              : {},
             tcpServiceCommand: isString(doContext.params) ? doContext.params : '',
           }
         : { doContext: doContext.params }),