@fmdeui/fmui 1.0.168 → 1.0.169

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

@@ -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,7 +257,8 @@ 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);
@@ -347,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;
     };
@@ -394,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;
           }
         }
       });
@@ -722,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

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.168 */
+/*! 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) :
@@ -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,7 +23300,8 @@
 	        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);
@@ -23390,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;
 	    };
@@ -23437,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;
 	          }
 	        }
 	      });
@@ -23765,7 +23777,8 @@
 	                    ref_key: "fQueryConditionRef",
 	                    ref: fQueryConditionRef,
 	                    boolEnter: false,
-	                    onHandleEvent: handleEvent
+	                    onHandleEvent: handleEvent,
+	                    onSubmit: handleSubmit
 	                  }, _ctx.$attrs),
 	                  vue.createSlots({
 	                    _: 2