@fmdeui/fmui 1.0.167 → 1.0.169

package/es/packages/components/select-table/src/index2.vue.mjs

@@ -111,7 +111,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const emits = __emit;
     const slots = useSlots();
     const isDefaultSelectVal = ref(true);
-    const forbidden = ref(true);
     const isRadio = ref(false);
     const isQueryVisible = ref(false);
     const isVisible = ref(false);
@@ -144,7 +143,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     const state = reactive({
-      defaultSelectValue: props.defaultSelectVal,
+      defaultSelectValue: Array.isArray(props.defaultSelectVal) ? props.defaultSelectVal : props.defaultSelectVal ? [props.defaultSelectVal] : [],
       // 默认选中
       tableData: props.table.data,
       // table数据
@@ -204,8 +203,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     watch(
       () => props.defaultSelectVal,
       (val) => {
-        state.defaultSelectValue = val;
-        if (val.length > 0) {
+        const valArray = Array.isArray(val) ? val : val ? [val] : [];
+        state.defaultSelectValue = valArray;
+        if (valArray.length > 0) {
           if (props.multiple) {
             if (isDefaultSelectVal.value) {
               defaultSelect(state.defaultSelectValue);
@@ -246,6 +246,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const internalLoading = ref(false);
     const internalQueryParams = reactive({ ...props.queryParams });
+    const fromqueryParams = reactive({});
     const fetchTableData = async (isResetPage = false) => {
       if (!props.apiService) return;
       internalLoading.value = true;
@@ -256,12 +257,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const requestParams = {
           page: pagination.currentPage,
           pageSize: pagination.pageSize,
-          ...internalQueryParams
+          ...internalQueryParams,
+          ...fromqueryParams
         };
         const res = await useBaseApi(props.apiService).post(requestParams, props.apiAction);
         const formatted = props.responseFormatter(res);
         pagination.total = formatted.total;
         state.tableData = formatted.data;
+        if (formatted.data && formatted.data.length > 0) {
+          formatted.data.forEach((item) => {
+            state.tabularMap[item[props.keywords.value]] = item[props.keywords.label];
+          });
+        }
         if (props.useVirtual) {
           saveDATA.value = formatted.data;
           updateRenderData(scrollTopNum.value);
@@ -342,6 +349,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const handleEvent = () => {
       selectRef.value.expanded = true;
     };
+    const handleSubmit = (from) => {
+      selectRef.value.expanded = true;
+      fromqueryParams.value = from;
+      fetchTableData(true);
+    };
     const queryVisibleChange = (val) => {
       isQueryVisible.value = val;
     };
@@ -389,16 +401,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const findLabel = () => {
       nextTick(() => {
-        var _a;
+        var _a, _b;
         if (props.multiple) {
-          (_a = selectRef.value.selected) == null ? void 0 : _a.forEach((item) => {
-            item.currentLabel = item.value;
+          (_b = (_a = selectRef.value) == null ? void 0 : _a.selected) == null ? void 0 : _b.forEach((item) => {
+            var _a2;
+            const targetId = item.value;
+            const foundLabel = state.tabularMap[targetId] || ((_a2 = state.tableData.find((row) => row[props.keywords.value] === targetId)) == null ? void 0 : _a2[props.keywords.label]) || targetId;
+            item.currentLabel = foundLabel;
           });
         } else {
+          const isObj = state.defaultValue && typeof state.defaultValue === "object";
+          const currentLabel = isObj ? state.defaultValue[props.keywords.label] : "";
           if (props.isRadioEchoLabel) {
-            selectDefaultLabel.value = state.defaultValue && state.defaultValue[props.keywords.label] || props.radioSelectValLabel;
+            selectDefaultLabel.value = currentLabel || props.radioSelectValLabel || "";
           } else {
-            selectDefaultLabel.value = state.defaultValue && state.defaultValue[props.keywords.label] || "";
+            selectDefaultLabel.value = currentLabel;
           }
         }
       });
@@ -423,7 +440,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         nowIndex.value = -1;
         radioVal.value = "";
         isDefaultSelectVal.value = true;
-        forbidden.value = false;
       }
     };
     const defaultSelect = (defaultSelectVal) => {
@@ -563,15 +579,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       isDefaultSelectVal.value = false;
       radioClick(row, rowValue);
     };
-    const isForbidden = () => {
-      forbidden.value = false;
-      setTimeout(() => {
-        forbidden.value = true;
-      }, 0);
-    };
     const radioClick = (row, rowValue) => {
-      forbidden.value = !forbidden.value;
-      if (radioVal.value === rowValue) {
+      const isAlreadySelected = state.defaultValue && state.defaultValue[props.keywords.value] === rowValue;
+      if (isAlreadySelected) {
         if (!props.radioSameIsCancel) return;
         clear();
       } else {
@@ -585,7 +595,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const updateState = (row, rowValue) => {
-      isForbidden();
       radioVal.value = rowValue;
       state.defaultValue = row;
       emits("radioChange", row, rowValue);
@@ -639,7 +648,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }
         nowIndex.value = -1;
         radioVal.value = "";
-        forbidden.value = false;
         selectDefaultLabel.value = null;
         resetDefaultState();
         emits("radioChange", null, null);
@@ -726,7 +734,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                     ref_key: "fQueryConditionRef",
                     ref: fQueryConditionRef,
                     boolEnter: false,
-                    onHandleEvent: handleEvent
+                    onHandleEvent: handleEvent,
+                    onSubmit: handleSubmit
                   }, _ctx.$attrs),
                   createSlots({
                     _: 2
@@ -824,7 +833,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_radio, {
                           modelValue: radioVal.value,
                           "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => radioVal.value = $event),
-                          label: scope.row[__props.keywords.label],
+                          label: scope.row[__props.keywords.value],
                           value: scope.row[__props.keywords.value],
                           disabled: scope.row.isRadioDisabled,
                           onClick: withModifiers(($event) => radioChangeHandle($event, scope.row, scope.row[__props.keywords.value]), ["stop"])

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.167 */
+/*! fmdeui-fmui v1.0.169 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -23154,7 +23154,6 @@
 	    const emits = __emit;
 	    const slots = vue.useSlots();
 	    const isDefaultSelectVal = vue.ref(true);
-	    const forbidden = vue.ref(true);
 	    const isRadio = vue.ref(false);
 	    const isQueryVisible = vue.ref(false);
 	    const isVisible = vue.ref(false);
@@ -23187,7 +23186,7 @@
 	      }
 	    });
 	    const state = vue.reactive({
-	      defaultSelectValue: props.defaultSelectVal,
+	      defaultSelectValue: Array.isArray(props.defaultSelectVal) ? props.defaultSelectVal : props.defaultSelectVal ? [props.defaultSelectVal] : [],
 	      // 默认选中
 	      tableData: props.table.data,
 	      // table数据
@@ -23247,8 +23246,9 @@
 	    vue.watch(
 	      () => props.defaultSelectVal,
 	      (val) => {
-	        state.defaultSelectValue = val;
-	        if (val.length > 0) {
+	        const valArray = Array.isArray(val) ? val : val ? [val] : [];
+	        state.defaultSelectValue = valArray;
+	        if (valArray.length > 0) {
 	          if (props.multiple) {
 	            if (isDefaultSelectVal.value) {
 	              defaultSelect(state.defaultSelectValue);
@@ -23289,6 +23289,7 @@
 	    });
 	    const internalLoading = vue.ref(false);
 	    const internalQueryParams = vue.reactive({ ...props.queryParams });
+	    const fromqueryParams = vue.reactive({});
 	    const fetchTableData = async (isResetPage = false) => {
 	      if (!props.apiService) return;
 	      internalLoading.value = true;
@@ -23299,12 +23300,18 @@
 	        const requestParams = {
 	          page: pagination.currentPage,
 	          pageSize: pagination.pageSize,
-	          ...internalQueryParams
+	          ...internalQueryParams,
+	          ...fromqueryParams
 	        };
 	        const res = await useBaseApi(props.apiService).post(requestParams, props.apiAction);
 	        const formatted = props.responseFormatter(res);
 	        pagination.total = formatted.total;
 	        state.tableData = formatted.data;
+	        if (formatted.data && formatted.data.length > 0) {
+	          formatted.data.forEach((item) => {
+	            state.tabularMap[item[props.keywords.value]] = item[props.keywords.label];
+	          });
+	        }
 	        if (props.useVirtual) {
 	          saveDATA.value = formatted.data;
 	          updateRenderData(scrollTopNum.value);
@@ -23385,6 +23392,11 @@
 	    const handleEvent = () => {
 	      selectRef.value.expanded = true;
 	    };
+	    const handleSubmit = (from) => {
+	      selectRef.value.expanded = true;
+	      fromqueryParams.value = from;
+	      fetchTableData(true);
+	    };
 	    const queryVisibleChange = (val) => {
 	      isQueryVisible.value = val;
 	    };
@@ -23432,16 +23444,21 @@
 	    };
 	    const findLabel = () => {
 	      vue.nextTick(() => {
-	        var _a;
+	        var _a, _b;
 	        if (props.multiple) {
-	          (_a = selectRef.value.selected) == null ? void 0 : _a.forEach((item) => {
-	            item.currentLabel = item.value;
+	          (_b = (_a = selectRef.value) == null ? void 0 : _a.selected) == null ? void 0 : _b.forEach((item) => {
+	            var _a2;
+	            const targetId = item.value;
+	            const foundLabel = state.tabularMap[targetId] || ((_a2 = state.tableData.find((row) => row[props.keywords.value] === targetId)) == null ? void 0 : _a2[props.keywords.label]) || targetId;
+	            item.currentLabel = foundLabel;
 	          });
 	        } else {
+	          const isObj = state.defaultValue && typeof state.defaultValue === "object";
+	          const currentLabel = isObj ? state.defaultValue[props.keywords.label] : "";
 	          if (props.isRadioEchoLabel) {
-	            selectDefaultLabel.value = state.defaultValue && state.defaultValue[props.keywords.label] || props.radioSelectValLabel;
+	            selectDefaultLabel.value = currentLabel || props.radioSelectValLabel || "";
 	          } else {
-	            selectDefaultLabel.value = state.defaultValue && state.defaultValue[props.keywords.label] || "";
+	            selectDefaultLabel.value = currentLabel;
 	          }
 	        }
 	      });
@@ -23466,7 +23483,6 @@
 	        nowIndex.value = -1;
 	        radioVal.value = "";
 	        isDefaultSelectVal.value = true;
-	        forbidden.value = false;
 	      }
 	    };
 	    const defaultSelect = (defaultSelectVal) => {
@@ -23606,15 +23622,9 @@
 	      isDefaultSelectVal.value = false;
 	      radioClick(row, rowValue);
 	    };
-	    const isForbidden = () => {
-	      forbidden.value = false;
-	      setTimeout(() => {
-	        forbidden.value = true;
-	      }, 0);
-	    };
 	    const radioClick = (row, rowValue) => {
-	      forbidden.value = !forbidden.value;
-	      if (radioVal.value === rowValue) {
+	      const isAlreadySelected = state.defaultValue && state.defaultValue[props.keywords.value] === rowValue;
+	      if (isAlreadySelected) {
 	        if (!props.radioSameIsCancel) return;
 	        clear();
 	      } else {
@@ -23628,7 +23638,6 @@
 	      }
 	    };
 	    const updateState = (row, rowValue) => {
-	      isForbidden();
 	      radioVal.value = rowValue;
 	      state.defaultValue = row;
 	      emits("radioChange", row, rowValue);
@@ -23682,7 +23691,6 @@
 	        }
 	        nowIndex.value = -1;
 	        radioVal.value = "";
-	        forbidden.value = false;
 	        selectDefaultLabel.value = null;
 	        resetDefaultState();
 	        emits("radioChange", null, null);
@@ -23769,7 +23777,8 @@
 	                    ref_key: "fQueryConditionRef",
 	                    ref: fQueryConditionRef,
 	                    boolEnter: false,
-	                    onHandleEvent: handleEvent
+	                    onHandleEvent: handleEvent,
+	                    onSubmit: handleSubmit
 	                  }, _ctx.$attrs),
 	                  vue.createSlots({
 	                    _: 2
@@ -23867,7 +23876,7 @@
 	                        vue.createVNode(_component_el_radio, {
 	                          modelValue: radioVal.value,
 	                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => radioVal.value = $event),
-	                          label: scope.row[__props.keywords.label],
+	                          label: scope.row[__props.keywords.value],
 	                          value: scope.row[__props.keywords.value],
 	                          disabled: scope.row.isRadioDisabled,
 	                          onClick: vue.withModifiers(($event) => radioChangeHandle($event, scope.row, scope.row[__props.keywords.value]), ["stop"])