@fecp/designer 5.5.63 → 5.5.65

package/lib/packages/mobile/src/components/form/search/Search.vue.js

@@ -7,6 +7,8 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                */
 ;/* empty css                                                 */
 const Vue = require("vue");
+const datasource = require("../../../utils/datasource.js");
+const QuickFilter = require("../../feedback/quickFilter/QuickFilter.vue.js");
 const index = require("../../../../node_modules/vant/es/search/index.js");
 const _sfc_main = {
   __name: "Search",
@@ -14,29 +16,171 @@ const _sfc_main = {
     placeholder: {
       type: String,
       default: ""
+    },
+    filterMode: {
+      type: String,
+      default: "input"
+    },
+    dataSources: {
+      type: Array,
+      default: () => []
+    },
+    filterConfig: {
+      type: Array,
+      default: () => []
     }
   },
-  setup(__props) {
-    const showAction = Vue.ref(false);
+  emits: ["filterChange"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const currentInstance = Vue.getCurrentInstance();
+    const ctx = currentInstance.proxy;
+    const searchData = Vue.ref("");
     function onClickFilter() {
-      showAction.value = true;
+    }
+    function onClickButton() {
+      onSearch(searchData.value);
     }
     function onSearch(val) {
     }
-    function onCancel() {
-      showAction.value = false;
+    function onQuickFilterChange(result) {
+      console.log("筛选数据:", result);
+      emit("filterChange", result);
     }
+    const filterData = Vue.ref([]);
+    const loadFieldDataSources = async () => {
+      var _a, _b;
+      const optionsDatas = [];
+      const fields = props.filterConfig;
+      const fieldDataSources = /* @__PURE__ */ new Set();
+      const dictionaryKeys = /* @__PURE__ */ new Set();
+      const dataSourceOptions = Vue.ref({});
+      const dictionaryOptions = Vue.ref({});
+      for (const component of fields) {
+        const { optionSource, dataSourceValue, dictionaryValue } = component.optionConfig;
+        if (optionSource === "dataSource" && dataSourceValue) {
+          fieldDataSources.add(dataSourceValue);
+        } else if (optionSource === "dictionary" && dictionaryValue) {
+          dictionaryKeys.add(dictionaryValue);
+        }
+      }
+      for (const dataSourceId of fieldDataSources) {
+        if (dataSourceOptions.value[dataSourceId]) continue;
+        try {
+          const dsManager = datasource.createDataSource({
+            http: ctx.$http,
+            dataSources: props.dataSources,
+            currentDataSourceId: dataSourceId
+          });
+          const data = await dsManager.fetch();
+          let options = [];
+          if (Array.isArray(data)) {
+            options = data;
+          } else if (typeof data === "object") {
+            options = Array.isArray(data.data) ? data.data : ((_a = data.data) == null ? void 0 : _a.records) || ((_b = data.data) == null ? void 0 : _b.list) || [];
+          }
+          dataSourceOptions.value[dataSourceId] = options;
+          dsManager.destroy();
+        } catch (error) {
+          console.error(`Failed to load data source ${dataSourceId}:`, error);
+        }
+      }
+      if (dictionaryKeys.size > 0) {
+        try {
+          const keyName = Array.from(dictionaryKeys).join(",");
+          const response = await ctx.$http.postForm(
+            "/base-server/parm/sysParmDic/getDicListByKey",
+            {
+              keyName
+            }
+          );
+          const dictionaryData = response;
+          if (typeof dictionaryData === "object") {
+            Object.keys(dictionaryData).forEach((dictKey) => {
+              if (dictionaryKeys.has(dictKey)) {
+                const dictItems = dictionaryData[dictKey];
+                if (Array.isArray(dictItems)) {
+                  dictionaryOptions.value[dictKey] = dictItems;
+                }
+              }
+            });
+          }
+        } catch (error) {
+          console.error("Failed to load dictionary data:", error);
+        }
+      }
+      fields.forEach((component) => {
+        if (!component.optionConfig) return;
+        let options = [];
+        const {
+          optionSource,
+          dataSourceValue,
+          dictionaryValue,
+          displayField,
+          valueField,
+          idField,
+          pidField
+        } = component.optionConfig;
+        if (optionSource === "dataSource" && dataSourceOptions.value[dataSourceValue]) {
+          const rawOptions = dataSourceOptions.value[dataSourceValue];
+          const labelField = displayField || "label";
+          const keyField = valueField || "value";
+          options = rawOptions.map((item) => ({
+            label: item[labelField],
+            value: item[keyField],
+            ...item
+          }));
+          optionsDatas.push({ ...component, options });
+        } else if (optionSource === "dictionary" && dictionaryOptions.value[dictionaryValue]) {
+          const rawOptions = dictionaryOptions.value[dictionaryValue];
+          const labelField = "optName";
+          const keyField = "optCode";
+          options = rawOptions.map((item) => ({
+            label: item[labelField],
+            value: item[keyField]
+          }));
+          optionsDatas.push({ ...component, options });
+        } else if (optionSource === "custom") {
+          optionsDatas.push({
+            ...component,
+            options: component.optionConfig.options || []
+          });
+        }
+      });
+      filterData.value = [...optionsDatas];
+    };
+    Vue.watch(
+      () => props.filterConfig.map((item) => ({
+        label: item.label
+      })),
+      () => {
+        loadFieldDataSources();
+      },
+      { deep: true, immediate: true }
+    );
     return (_ctx, _cache) => {
       const _component_van_search = index.Search;
-      return Vue.openBlock(), Vue.createBlock(_component_van_search, {
-        shape: "round",
-        placeholder: __props.placeholder,
-        "show-action": Vue.unref(showAction),
-        clearable: "",
-        onSearch,
-        onCancel,
-        onClickInput: onClickFilter
-      }, null, 8, ["placeholder", "show-action"]);
+      return Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, null, [
+        Vue.createVNode(_component_van_search, {
+          modelValue: Vue.unref(searchData),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => Vue.isRef(searchData) ? searchData.value = $event : null),
+          shape: "round",
+          placeholder: __props.placeholder,
+          "show-action": __props.filterMode == "input",
+          clearable: "",
+          onClickInput: _cache[1] || (_cache[1] = Vue.withModifiers(($event) => __props.filterMode == "router" && onClickFilter, ["stop"]))
+        }, {
+          action: Vue.withCtx(() => [
+            Vue.createElementVNode("div", { onClick: onClickButton }, "搜索")
+          ]),
+          _: 1
+        }, 8, ["modelValue", "placeholder", "show-action"]),
+        Vue.createVNode(QuickFilter.default, {
+          "filter-data": Vue.unref(filterData),
+          onChange: onQuickFilterChange
+        }, null, 8, ["filter-data"])
+      ], 64);
     };
   }
 };

package/lib/packages/vue/src/components/details/footer/Footer.vue.js

@@ -34,7 +34,8 @@ const _sfc_main = {
     };
     const showFooter = Vue.ref(true);
     Vue.onMounted(() => {
-      const layoutDom = formDetailsFooterRef.value.$el.closest(".fec-layout-row");
+      var _a;
+      const layoutDom = (_a = formDetailsFooterRef.value) == null ? void 0 : _a.$el.closest(".fec-layout-row");
       if (layoutDom && props.formMode == "query") {
         showFooter.value = false;
       }
@@ -75,5 +76,5 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-69e1a97b"]]);
+const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-deabd2d2"]]);
 exports.default = component;

package/lib/packages/vue/src/components/forms/cascader/Cascader.vue.js

@@ -109,7 +109,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           textArr.push(label);
         }
       });
-      return textArr.join("|");
+      return textArr.join(" / ");
     };
     const options = Vue.computed(() => {
       if (!props.optionConfig) return [];

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -1215,5 +1215,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5127d7fd"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0976aa9f"]]);
 exports.default = _Form;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.5.63",
+  "version": "5.5.65",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [