Browse Source

fix: change multiple select

DESKTOP-USV654P\pc 4 months ago
parent
commit
6b77ee8055

+ 0 - 1
src/components/MultiplePopup/src/MultiplePopup.vue

@@ -119,7 +119,6 @@
   const getSubDatasourceList = async () => {
     let showValueArr: string[] = [];
     await MultipleSelectRef.value?.getDatasourceList();
-
     selectedDataSourceVal.value = [];
     defaultVal.value = props.value;
     const selectedArr = props.value?.split(',');

+ 15 - 5
src/components/MultiplePopup/src/components/MultipleSelect.vue

@@ -142,7 +142,7 @@
       await getDatasourceList(1);
     }
     await nextTick(() => {
-      console.log(props.selectedDataSource);
+      // console.log(props.selectedDataSource);
     });
   });
 
@@ -222,6 +222,7 @@
   watch(
     () => props.multipleDialog,
     () => {
+      // console.log('multipleDialog', props.multipleDialog);
       if (props.multipleDialog) {
         selectedList.value = [];
         state.selectedRowKeys = [];
@@ -237,6 +238,7 @@
     () => {
       emit('getList', state.dataSourceList);
       if (!state.dataSourceList.length) return;
+      // console.log('dataSourceList', state.dataSourceList, props.selectedDataSource);
       initData();
       const seenIds = new Map();
       selectedList.value = selectedList.value.filter((item) => {
@@ -254,9 +256,9 @@
     },
   );
   const initData = () => {
-    console.log('props.valueField', props.valueField, props.uniqueKey);
+    // console.log('initData', props.isSubFormUse, props.selectedDataSource);
     if (!props.isSubFormUse) {
-      state.dataSourceList.map((data: any, index: number) => {
+      state.dataSourceList.map((data: any) => {
         const id = data[props.valueField!] || data[props.uniqueKey!];
         // data.key = index + 1;
         if (props.value) {
@@ -271,7 +273,7 @@
       });
     }
     if (props.isSubFormUse) {
-      state.dataSourceList.map((data: any, index: number) => {
+      state.dataSourceList.map((data: any) => {
         // data.key = index + 1;
         const id = data[props.valueField!] || data[props.uniqueKey!];
         props.selectedDataSource.map((select: any) => {
@@ -282,6 +284,12 @@
           }
         });
       });
+
+      // props.selectedDataSource.map((select: any) => {
+      //   const sId = select[props.valueField!] || select[props.uniqueKey!];
+      //   selectedList.value.push({ ...select });
+      //   state.selectedRowKeys.push(sId);
+      // });
     }
   };
   const resetSearch = () => {
@@ -297,14 +305,16 @@
     let showValueArr: string[] = [];
     let saveValue = '';
     let showValue = '';
+    // console.log('submitDialog', selectedList.value);
     selectedList.value?.map((item: any) => {
       saveValueArr.push(item[props.valueField!]);
       showValueArr.push(item[props.labelField!]);
     });
+    state.searchText = '';
     //value相同去重
     saveValue = [...new Set(saveValueArr)].join(',');
     showValue = showValueArr.join(',');
-    console.log(saveValue, showValue);
+    // console.log('submitDialog e', saveValue, showValue);
     setFormModel();
     emit('update:multipleDialog', false);
     emit('update:popupValue', showValue);