Merge branch 'fix/DEFECT-1494' into 'main_dev'

fix: 修改控制组问题和看板编辑创建没有恢复默认

See merge request yunteng/thingskit-front!809

@@ -95,6 +95,10 @@
         };
         };
         setFormValues(record);
         setFormValues(record);
       } else {
       } else {
+        selectWidgetKeys.value = {
+          componentKey: TextComponent1Config.key,
+          categoryKey: PackagesCategoryEnum.TEXT,
+        };
         dataSource.value = [genNewDataSourceItem()];
         dataSource.value = [genNewDataSourceItem()];
       }
       }
     }
     }

@@ -19,6 +19,7 @@
   const currentValue = ref(false);
   const currentValue = ref(false);
 
 
   const getDesign = computed(() => {
   const getDesign = computed(() => {
+    // console.log(props.config, 'config');
     const { option } = props.config;
     const { option } = props.config;
     const {
     const {
       attribute,
       attribute,

@@ -352,18 +352,6 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                       : undefined,
                       : undefined,
                 });
                 });
 
 
-                // 当我们通过复制组件在进行编辑的时候选择控制组件会使不是bool属性的值进行赋值
-                if (
-                  (!option?.length &&
-                    isControlComponent(category!) &&
-                    unref(selectWidgetKeys).componentKey !== 'LateralNumericalControl') ||
-                  isBooleanComponent(unref(selectWidgetKeys))
-                ) {
-                  setFieldsValue({
-                    [DataSourceField.ATTRIBUTE]: null,
-                  });
-                }
-
                 // 选择控制组件4的时候只能选择属性且是（int double类型）
                 // 选择控制组件4的时候只能选择属性且是（int double类型）
                 if (unref(selectWidgetKeys).componentKey == 'LateralNumericalControl') {
                 if (unref(selectWidgetKeys).componentKey == 'LateralNumericalControl') {
                   setFieldsValue({
                   setFieldsValue({

@@ -102,7 +102,7 @@ class Subscriber {
       return {
       return {
         cmdId: subscriptionId,
         cmdId: subscriptionId,
         entityId: deviceId,
         entityId: deviceId,
-        keys: Array.from(attributes.values()).join(','),
+        keys: Array.from(attributes.values()).filter(Boolean).join(','),
         entityType: EntityTypeEnum.DEVICE,
         entityType: EntityTypeEnum.DEVICE,
         scope: ScopeTypeEnum.LATEST_TELEMERY,
         scope: ScopeTypeEnum.LATEST_TELEMERY,
         ...(unsubscribe ? { unsubscribe } : {}),
         ...(unsubscribe ? { unsubscribe } : {}),
@@ -354,6 +354,7 @@ export const useDataFetch = (
   props: { config: ComponentPropsConfigType },
   props: { config: ComponentPropsConfigType },
   updateFn: DataFetchUpdateFn
   updateFn: DataFetchUpdateFn
 ) => {
 ) => {
+  console.log(props, 'props');
   const getBindAttribute = computed(() => {
   const getBindAttribute = computed(() => {
     const { config } = props;
     const { config } = props;
     const { option } = config as ComponentPropsConfigType<Recordable, DataSource>;
     const { option } = config as ComponentPropsConfigType<Recordable, DataSource>;