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

…ix/components-lateralNumericalControl

@@ -34,6 +34,7 @@ export enum DataSourceField {
   DEVICE_ID = 'deviceId',
   DEVICE_ID = 'deviceId',
   DEVICE_PROFILE_ID = 'deviceProfileId',
   DEVICE_PROFILE_ID = 'deviceProfileId',
   ATTRIBUTE = 'attribute',
   ATTRIBUTE = 'attribute',
+  ATTRIBUTE_NAME = 'attributeName',
   ATTRIBUTE_RENAME = 'attributeRename',
   ATTRIBUTE_RENAME = 'attributeRename',
   DEVICE_NAME = 'deviceName',
   DEVICE_NAME = 'deviceName',
   DEVICE_RENAME = 'deviceRename',
   DEVICE_RENAME = 'deviceRename',
@@ -118,6 +119,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
               [DataSourceField.DEVICE_PROFILE_ID]: null,
               [DataSourceField.DEVICE_PROFILE_ID]: null,
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.ATTRIBUTE]: null,
               [DataSourceField.ATTRIBUTE]: null,
+              [DataSourceField.ATTRIBUTE_NAME]: null,
               [DataSourceField.TRANSPORT_TYPE]: null,
               [DataSourceField.TRANSPORT_TYPE]: null,
             });
             });
           },
           },
@@ -152,6 +154,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             setFieldsValue({
             setFieldsValue({
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.ATTRIBUTE]: null,
               [DataSourceField.ATTRIBUTE]: null,
+              [DataSourceField.ATTRIBUTE_NAME]: null,
               [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
               [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
             });
             });
           },
           },
@@ -228,6 +231,12 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       },
       },
     },
     },
     {
     {
+      field: DataSourceField.ATTRIBUTE_NAME,
+      component: 'Input',
+      label: '属性名',
+      show: false,
+    },
+    {
       field: DataSourceField.ATTRIBUTE,
       field: DataSourceField.ATTRIBUTE,
       component: 'ApiSelect',
       component: 'ApiSelect',
       label: '属性',
       label: '属性',
@@ -235,7 +244,8 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       rules: [{ required: true, message: '请选择属性' }],
       rules: [{ required: true, message: '请选择属性' }],
       ifShow: ({ model }) =>
       ifShow: ({ model }) =>
         !(isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]) && isControlComponent(category!)),
         !(isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]) && isControlComponent(category!)),
-      componentProps({ formModel }) {
+      componentProps({ formModel, formActionType }) {
+        const { setFieldsValue } = formActionType;
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         return {
         return {
           api: async () => {
           api: async () => {
@@ -256,6 +266,9 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
           },
           },
           placeholder: '请选择属性',
           placeholder: '请选择属性',
           getPopupContainer: () => document.body,
           getPopupContainer: () => document.body,
+          onChange(value: string, option: Record<'label' | 'value', string>) {
+            setFieldsValue({ [DataSourceField.ATTRIBUTE_NAME]: value ? option.label : null });
+          },
         };
         };
       },
       },
     },
     },

+import { DataSource } from '../../palette/types';
+import { PublicComponentOptions } from '../index.type';
+import { isArray } from '/@/utils/is';
+
+export const getAttributeName = (option: PublicComponentOptions & DataSource) => {
+  const { attribute, attributeRename, attributeName } = option || {};
+  return attributeRename || attributeName || attribute;
+};
+
+export const useExtractValueByKeys = <T = Recordable>(
+  keys: string[] | string,
+  sourceValue: T = {} as T,
+  defaultValue: Recordable = {} as Recordable
+): T => {
+  keys = isArray(keys) ? keys : [keys];
+  return keys.reduce((prev, next) => {
+    return { ...prev, [next]: sourceValue[next] || defaultValue[next] };
+  }, {} as T);
+};

@@ -19,6 +19,7 @@ export interface DataSource {
   deviceId: string;
   deviceId: string;
   deviceType: string;
   deviceType: string;
   attribute: string;
   attribute: string;
+  attributeName: string;
   deviceName: string;
   deviceName: string;
   gatewayDevice: boolean;
   gatewayDevice: boolean;
   slaveDeviceId: string;
   slaveDeviceId: string;