@fmdeui/fmui 1.0.166 → 1.0.168

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);
@@ -262,6 +262,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         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);
@@ -423,7 +428,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         nowIndex.value = -1;
         radioVal.value = "";
         isDefaultSelectVal.value = true;
-        forbidden.value = false;
       }
     };
     const defaultSelect = (defaultSelectVal) => {
@@ -446,7 +450,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         setTimeout(() => {
           const row = state.tableData.find((item) => item[props.keywords.value] === defaultSelectVal[0]);
           if (row) {
-            radioVal.value = state.tableData.indexOf(row) + 1;
+            radioVal.value = row[props.keywords.value];
             state.defaultValue = row;
             selectDefaultLabel.value = row[props.keywords.label];
             modeValueId.value = row[props.keywords.value];
@@ -484,35 +488,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const filterMethodHandle = (val) => {
       var _a;
       if (!props.filterable) return;
+      if (props.apiService) return;
       if (props.filterable && props.remote && typeof props.remoteMethod === "function") {
         props.remoteMethod(val);
         return;
       }
       const tableData = JSON.parse(JSON.stringify((_a = props.table) == null ? void 0 : _a.data));
       if (!tableData || tableData.length === 0) return;
-      if (!props.multiple) {
-        if (val) {
-          radioVal.value = "";
-        } else {
-          const defaultIndex = tableData.findIndex(
-            (item) => item[props.keywords.label] === selectDefaultLabel.value
-          );
-          if (defaultIndex !== -1) {
-            radioVal.value = defaultIndex + 1;
-          }
-        }
-      }
+      const currentSelectedId = modeValueId.value;
       state.tableData = tableData.filter((item) => {
         var _a2;
-        return (_a2 = item[props.keywords.label]) == null ? void 0 : _a2.includes(val);
+        return (_a2 = item[props.keywords.label]) == null ? void 0 : _a2.toLowerCase().includes(val.toLowerCase());
       });
-      if (selectDefaultLabel.value) {
-        const defaultIndex = state.tableData.findIndex(
-          (item) => item[props.keywords.label] === selectDefaultLabel.value
+      if (currentSelectedId) {
+        const isStillInTable = state.tableData.some(
+          (item) => item[props.keywords.value] === currentSelectedId
         );
-        if (defaultIndex !== -1) {
-          radioVal.value = defaultIndex + 1;
+        if (isStillInTable) {
+          radioVal.value = currentSelectedId;
+        } else {
+          radioVal.value = "";
         }
+      } else {
+        radioVal.value = "";
       }
     };
     const initTableData = () => {
@@ -529,7 +527,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           });
         } else {
           const matchedRow = (_b = state.tableData) == null ? void 0 : _b.find(
-            (item) => item[props.keywords.value] === selectDefaultLabel.value
+            (item) => item[props.keywords.value] === modeValueId.value
           );
           if (matchedRow) {
             selectTable.value.setCurrentRow(matchedRow);
@@ -563,25 +561,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         showMessage("error", error.message || t("plus.copy.copyFail"));
       }
     };
-    const radioChangeHandle = (event, row, index) => {
+    const radioChangeHandle = (event, row, rowValue) => {
       event.preventDefault();
       if (row.isRadioDisabled) return;
       isDefaultSelectVal.value = false;
-      radioClick(row, index);
-    };
-    const isForbidden = () => {
-      forbidden.value = false;
-      setTimeout(() => {
-        forbidden.value = true;
-      }, 0);
+      radioClick(row, rowValue);
     };
-    const radioClick = (row, index) => {
-      forbidden.value = !forbidden.value;
-      if (radioVal.value === index) {
+    const radioClick = (row, rowValue) => {
+      const isAlreadySelected = state.defaultValue && state.defaultValue[props.keywords.value] === rowValue;
+      if (isAlreadySelected) {
         if (!props.radioSameIsCancel) return;
         clear();
       } else {
-        updateState(row, index);
+        updateState(row, rowValue);
       }
       if (props.isExpanded && state.defaultValue) {
         selectDefaultLabel.value = state.defaultValue[props.keywords.label] || "";
@@ -590,29 +582,23 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         blur();
       }
     };
-    const updateState = (row, index) => {
-      isForbidden();
-      radioVal.value = index;
+    const updateState = (row, rowValue) => {
+      radioVal.value = rowValue;
       state.defaultValue = row;
-      emits("radioChange", row, row[props.keywords.value]);
-      modeValueId.value = row[props.keywords.value];
+      emits("radioChange", row, rowValue);
+      modeValueId.value = rowValue;
       modeValueName.value = row[props.keywords.label];
     };
     const rowClick = async (row) => {
       if (row.isRadioDisabled) return;
       if (!props.rowClickRadio) return;
       if (!props.multiple) {
-        const rowIndex = state.tableData.findIndex(
-          (item) => item[props.keywords.value] === row[props.keywords.value]
-        );
-        if (rowIndex !== -1) {
-          isDefaultSelectVal.value = false;
-          await radioClick(row, rowIndex + 1);
-          if (radioVal.value) {
-            isRadio.value = true;
-          } else {
-            isRadio.value = false;
-          }
+        isDefaultSelectVal.value = false;
+        await radioClick(row, row[props.keywords.value]);
+        if (radioVal.value) {
+          isRadio.value = true;
+        } else {
+          isRadio.value = false;
         }
       }
     };
@@ -650,7 +636,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }
         nowIndex.value = -1;
         radioVal.value = "";
-        forbidden.value = false;
         selectDefaultLabel.value = null;
         resetDefaultState();
         emits("radioChange", null, null);
@@ -835,10 +820,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_radio, {
                           modelValue: radioVal.value,
                           "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => radioVal.value = $event),
-                          label: scope.$index + 1,
+                          label: scope.row[__props.keywords.value],
+                          value: scope.row[__props.keywords.value],
                           disabled: scope.row.isRadioDisabled,
-                          onClick: withModifiers(($event) => radioChangeHandle($event, scope.row, scope.$index + 1), ["stop"])
-                        }, null, 8, ["modelValue", "label", "disabled", "onClick"])
+                          onClick: withModifiers(($event) => radioChangeHandle($event, scope.row, scope.row[__props.keywords.value]), ["stop"])
+                        }, null, 8, ["modelValue", "label", "value", "disabled", "onClick"])
                       ]),
                       _: 1
                       /* STABLE */

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.166 */
+/*! fmdeui-fmui v1.0.168 */
 (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);
@@ -23305,6 +23305,11 @@
 	        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);
@@ -23466,7 +23471,6 @@
 	        nowIndex.value = -1;
 	        radioVal.value = "";
 	        isDefaultSelectVal.value = true;
-	        forbidden.value = false;
 	      }
 	    };
 	    const defaultSelect = (defaultSelectVal) => {
@@ -23489,7 +23493,7 @@
 	        setTimeout(() => {
 	          const row = state.tableData.find((item) => item[props.keywords.value] === defaultSelectVal[0]);
 	          if (row) {
-	            radioVal.value = state.tableData.indexOf(row) + 1;
+	            radioVal.value = row[props.keywords.value];
 	            state.defaultValue = row;
 	            selectDefaultLabel.value = row[props.keywords.label];
 	            modeValueId.value = row[props.keywords.value];
@@ -23527,35 +23531,29 @@
 	    const filterMethodHandle = (val) => {
 	      var _a;
 	      if (!props.filterable) return;
+	      if (props.apiService) return;
 	      if (props.filterable && props.remote && typeof props.remoteMethod === "function") {
 	        props.remoteMethod(val);
 	        return;
 	      }
 	      const tableData = JSON.parse(JSON.stringify((_a = props.table) == null ? void 0 : _a.data));
 	      if (!tableData || tableData.length === 0) return;
-	      if (!props.multiple) {
-	        if (val) {
-	          radioVal.value = "";
-	        } else {
-	          const defaultIndex = tableData.findIndex(
-	            (item) => item[props.keywords.label] === selectDefaultLabel.value
-	          );
-	          if (defaultIndex !== -1) {
-	            radioVal.value = defaultIndex + 1;
-	          }
-	        }
-	      }
+	      const currentSelectedId = modeValueId.value;
 	      state.tableData = tableData.filter((item) => {
 	        var _a2;
-	        return (_a2 = item[props.keywords.label]) == null ? void 0 : _a2.includes(val);
+	        return (_a2 = item[props.keywords.label]) == null ? void 0 : _a2.toLowerCase().includes(val.toLowerCase());
 	      });
-	      if (selectDefaultLabel.value) {
-	        const defaultIndex = state.tableData.findIndex(
-	          (item) => item[props.keywords.label] === selectDefaultLabel.value
+	      if (currentSelectedId) {
+	        const isStillInTable = state.tableData.some(
+	          (item) => item[props.keywords.value] === currentSelectedId
 	        );
-	        if (defaultIndex !== -1) {
-	          radioVal.value = defaultIndex + 1;
+	        if (isStillInTable) {
+	          radioVal.value = currentSelectedId;
+	        } else {
+	          radioVal.value = "";
 	        }
+	      } else {
+	        radioVal.value = "";
 	      }
 	    };
 	    const initTableData = () => {
@@ -23572,7 +23570,7 @@
 	          });
 	        } else {
 	          const matchedRow = (_b = state.tableData) == null ? void 0 : _b.find(
-	            (item) => item[props.keywords.value] === selectDefaultLabel.value
+	            (item) => item[props.keywords.value] === modeValueId.value
 	          );
 	          if (matchedRow) {
 	            selectTable.value.setCurrentRow(matchedRow);
@@ -23606,25 +23604,19 @@
 	        showMessage("error", error.message || t("plus.copy.copyFail"));
 	      }
 	    };
-	    const radioChangeHandle = (event, row, index) => {
+	    const radioChangeHandle = (event, row, rowValue) => {
 	      event.preventDefault();
 	      if (row.isRadioDisabled) return;
 	      isDefaultSelectVal.value = false;
-	      radioClick(row, index);
-	    };
-	    const isForbidden = () => {
-	      forbidden.value = false;
-	      setTimeout(() => {
-	        forbidden.value = true;
-	      }, 0);
+	      radioClick(row, rowValue);
 	    };
-	    const radioClick = (row, index) => {
-	      forbidden.value = !forbidden.value;
-	      if (radioVal.value === index) {
+	    const radioClick = (row, rowValue) => {
+	      const isAlreadySelected = state.defaultValue && state.defaultValue[props.keywords.value] === rowValue;
+	      if (isAlreadySelected) {
 	        if (!props.radioSameIsCancel) return;
 	        clear();
 	      } else {
-	        updateState(row, index);
+	        updateState(row, rowValue);
 	      }
 	      if (props.isExpanded && state.defaultValue) {
 	        selectDefaultLabel.value = state.defaultValue[props.keywords.label] || "";
@@ -23633,29 +23625,23 @@
 	        blur();
 	      }
 	    };
-	    const updateState = (row, index) => {
-	      isForbidden();
-	      radioVal.value = index;
+	    const updateState = (row, rowValue) => {
+	      radioVal.value = rowValue;
 	      state.defaultValue = row;
-	      emits("radioChange", row, row[props.keywords.value]);
-	      modeValueId.value = row[props.keywords.value];
+	      emits("radioChange", row, rowValue);
+	      modeValueId.value = rowValue;
 	      modeValueName.value = row[props.keywords.label];
 	    };
 	    const rowClick = async (row) => {
 	      if (row.isRadioDisabled) return;
 	      if (!props.rowClickRadio) return;
 	      if (!props.multiple) {
-	        const rowIndex = state.tableData.findIndex(
-	          (item) => item[props.keywords.value] === row[props.keywords.value]
-	        );
-	        if (rowIndex !== -1) {
-	          isDefaultSelectVal.value = false;
-	          await radioClick(row, rowIndex + 1);
-	          if (radioVal.value) {
-	            isRadio.value = true;
-	          } else {
-	            isRadio.value = false;
-	          }
+	        isDefaultSelectVal.value = false;
+	        await radioClick(row, row[props.keywords.value]);
+	        if (radioVal.value) {
+	          isRadio.value = true;
+	        } else {
+	          isRadio.value = false;
 	        }
 	      }
 	    };
@@ -23693,7 +23679,6 @@
 	        }
 	        nowIndex.value = -1;
 	        radioVal.value = "";
-	        forbidden.value = false;
 	        selectDefaultLabel.value = null;
 	        resetDefaultState();
 	        emits("radioChange", null, null);
@@ -23878,10 +23863,11 @@
 	                        vue.createVNode(_component_el_radio, {
 	                          modelValue: radioVal.value,
 	                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => radioVal.value = $event),
-	                          label: scope.$index + 1,
+	                          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.$index + 1), ["stop"])
-	                        }, null, 8, ["modelValue", "label", "disabled", "onClick"])
+	                          onClick: vue.withModifiers(($event) => radioChangeHandle($event, scope.row, scope.row[__props.keywords.value]), ["stop"])
+	                        }, null, 8, ["modelValue", "label", "value", "disabled", "onClick"])
 	                      ]),
 	                      _: 1
 	                      /* STABLE */