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

fix: 修复场景联动查看全部都要置灰，不允许点击，还有数据流转中的数据源

See merge request yunteng/thingskit-front!922

@@ -126,10 +126,16 @@
         }
         }
       }
       }
 
 
-      async function handleFetch() {
-        if (!props.immediate && unref(isFirstLoad)) {
+      // async function handleFetch() {
+      //   if (!props.immediate && unref(isFirstLoad)) {
+      //     await fetch();
+      //     isFirstLoad.value = false;
+      //   }
+      // }
+
+      async function handleFetch(open) {
+        if (open) {
           await fetch();
           await fetch();
-          isFirstLoad.value = false;
         }
         }
       }
       }
 
 

@@ -30,12 +30,14 @@
       modalProps?: ExtractPropTypes<InstanceType<typeof BasicModal>['$props']>;
       modalProps?: ExtractPropTypes<InstanceType<typeof BasicModal>['$props']>;
       transferProps?: ExtractPropTypes<TransferType['$props']>;
       transferProps?: ExtractPropTypes<TransferType['$props']>;
       buttonProps?: ExtractPropTypes<InstanceType<typeof Button>['$props']>;
       buttonProps?: ExtractPropTypes<InstanceType<typeof Button>['$props']>;
+      disabled?: any;
     }>(),
     }>(),
     {
     {
       labelField: 'label',
       labelField: 'label',
       valueField: 'value',
       valueField: 'value',
       buttonName: '选择产品',
       buttonName: '选择产品',
       maxTagLength: 2,
       maxTagLength: 2,
+      disabled: false,
     }
     }
   );
   );
 
 
@@ -146,6 +148,8 @@
   );
   );
 
 
   const handleOpenModal = () => {
   const handleOpenModal = () => {
+    const { disabled } = props;
+    if (disabled) return;
     openModal(true);
     openModal(true);
   };
   };
 
 

@@ -42,6 +42,7 @@
       onValueChange?: (selectedRowkeys: string[]) => any[];
       onValueChange?: (selectedRowkeys: string[]) => any[];
       onRemoveAfter?: (actionType: ActionType) => Promise<any>;
       onRemoveAfter?: (actionType: ActionType) => Promise<any>;
       onSelectedAfter?: (actionType: ActionType) => Promise<any>;
       onSelectedAfter?: (actionType: ActionType) => Promise<any>;
+      disabled?: any;
     }>(),
     }>(),
     {
     {
       buttonName: '选择设备',
       buttonName: '选择设备',
@@ -49,6 +50,7 @@
       maxTagLength: 2,
       maxTagLength: 2,
       labelField: 'label',
       labelField: 'label',
       valueField: 'value',
       valueField: 'value',
+      disabled: false,
     }
     }
   );
   );
 
 
@@ -217,6 +219,8 @@
   }
   }
 
 
   const handleOpenModal = async () => {
   const handleOpenModal = async () => {
+    const { disabled } = props;
+    if (disabled) return;
     openModal(true);
     openModal(true);
     await nextTick();
     await nextTick();
     if (props.value && !props.value.length) {
     if (props.value && !props.value.length) {

@@ -61,7 +61,6 @@
       //input动态数据
       //input动态数据
       const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
       const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
 
 
-      console.log(dynamicInput, 'dynamicInput');
       //删除Input
       //删除Input
       const remove = (item: Params) => {
       const remove = (item: Params) => {
         let index = dynamicInput.params.indexOf(item);
         let index = dynamicInput.params.indexOf(item);
@@ -71,11 +70,6 @@
         emitChange();
         emitChange();
       };
       };
 
 
-      // const disabled = computed(() => {
-      //   const { disabled } = props || {};
-      //   return disabled;
-      // });
-
       //新增Input
       //新增Input
       const add = () => {
       const add = () => {
         dynamicInput.params.push({
         dynamicInput.params.push({

@@ -16,6 +16,7 @@
   import { BasicInfoFormField } from './enum';
   import { BasicInfoFormField } from './enum';
   import { BasicInfoRecord } from './types';
   import { BasicInfoRecord } from './types';
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
+  import { ref, unref } from 'vue';
 
 
   const props = defineProps({
   const props = defineProps({
     saveContent: {
     saveContent: {
@@ -25,8 +26,9 @@
 
 
   const emit = defineEmits(['currentDataFlowMethodEmitNext']);
   const emit = defineEmits(['currentDataFlowMethodEmitNext']);
 
 
+  const disabled = ref<boolean>(false);
   const [register, { validateFields, setFieldsValue, resetFields, setProps }] = useForm({
   const [register, { validateFields, setFieldsValue, resetFields, setProps }] = useForm({
-    schemas: modeForm(props.saveContent),
+    schemas: modeForm(props.saveContent, unref(disabled)),
     ...modelFormPublicConfig,
     ...modelFormPublicConfig,
   });
   });
 
 
@@ -61,12 +63,21 @@
     emit('currentDataFlowMethodEmitNext', getValue());
     emit('currentDataFlowMethodEmitNext', getValue());
   };
   };
 
 
+  const setDisabledProps = (value) => {
+    setProps(value);
+    disabled.value = false;
+  };
+  const setCancelDisabled = () => {
+    disabled.value = false;
+  };
+
   const resetValue = () => resetFields();
   const resetValue = () => resetFields();
   defineExpose({
   defineExpose({
     getValue,
     getValue,
     setValue,
     setValue,
     resetValue,
     resetValue,
-    setProps,
+    setDisabledProps,
+    setCancelDisabled,
   });
   });
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>

@@ -75,7 +75,9 @@
     const { text, record } = data;
     const { text, record } = data;
     businessText.value = text;
     businessText.value = text;
     if (businessText.value == BusinessDataFlowTextEnum.BUSINESS_MODAL_VIEW_TEXT) {
     if (businessText.value == BusinessDataFlowTextEnum.BUSINESS_MODAL_VIEW_TEXT) {
-      dataFlowMethodRef.value?.setProps({ disabled: true });
+      dataFlowMethodRef.value?.setDisabledProps({ disabled: true });
+    } else {
+      dataFlowMethodRef.value?.setCancelDisabled();
     }
     }
     restData.data = record;
     restData.data = record;
     setModalProps(modalProps(businessText.value));
     setModalProps(modalProps(businessText.value));

@@ -150,7 +150,10 @@ const TransferTableProps: BasicTableProps = {
   fetchSetting: FETCH_SETTING,
   fetchSetting: FETCH_SETTING,
 } as BasicTableProps;
 } as BasicTableProps;
 
 
-export const modeForm = (submitFn?: Function): FormSchema[] => {
+export const modeForm = (
+  submitFn: Function | undefined,
+  disabled?: boolean | any
+): FormSchema[] => {
   return [
   return [
     {
     {
       field: BasicInfoFormField.CONVERT_CONFIG_ID,
       field: BasicInfoFormField.CONVERT_CONFIG_ID,
@@ -187,6 +190,7 @@ export const modeForm = (submitFn?: Function): FormSchema[] => {
           api: getDeviceProfile,
           api: getDeviceProfile,
           labelField: 'name',
           labelField: 'name',
           valueField: 'tbProfileId',
           valueField: 'tbProfileId',
+          disabled,
           transferProps: {
           transferProps: {
             listStyle: { height: '400px' },
             listStyle: { height: '400px' },
             showSearch: true,
             showSearch: true,
@@ -222,6 +226,7 @@ export const modeForm = (submitFn?: Function): FormSchema[] => {
           labelField: 'name',
           labelField: 'name',
           valueField: 'tbDeviceId',
           valueField: 'tbDeviceId',
           primaryKey: 'tbDeviceId',
           primaryKey: 'tbDeviceId',
+          disabled,
           pendingTableProps: {
           pendingTableProps: {
             ...TransferTableProps,
             ...TransferTableProps,
             api: devicePage,
             api: devicePage,

@@ -208,7 +208,15 @@
   };
   };
   const [
   const [
     registerAction,
     registerAction,
-    { getFieldsValue, resetFields, setFieldsValue, validate, clearValidate, validateFields },
+    {
+      getFieldsValue,
+      resetFields,
+      setFieldsValue,
+      validate,
+      clearValidate,
+      validateFields,
+      setProps,
+    },
   ] = useForm({
   ] = useForm({
     schemas: actionSchema,
     schemas: actionSchema,
     showActionButtonGroup: false,
     showActionButtonGroup: false,