@fecp/designer 5.5.83 → 5.5.85

package/es/packages/vue/src/components/bus/contract/Contract.vue.mjs

@@ -77,6 +77,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         (openBlock(), createBlock(resolveDynamicComponent(unref(currentComponent)), {
+          id: `comp_${__props.config.id}`,
           mode: unref(mode),
           busNo: unref(busNo),
           contNo: unref(contNo),
@@ -84,7 +85,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           genType: __props.config.genType,
           parmList: unref(parsedParams),
           onLoaded: loaded
-        }, null, 40, ["mode", "busNo", "contNo", "modeNo", "genType", "parmList"]))
+        }, null, 40, ["id", "mode", "busNo", "contNo", "modeNo", "genType", "parmList"]))
       ]);
     };
   }

package/es/packages/vue/src/components/forms/number/Number.vue.mjs

@@ -279,7 +279,35 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
     const handleBlur = (event) => {
       let value = event.target.value;
-      handlerValue(value);
+      if (!value && value !== 0) {
+        compValue.value = value;
+        return;
+      }
+      let cleanValue = delcommafy(value.toString());
+      let numValue = Number(cleanValue);
+      if (isNaN(numValue)) return;
+      numValue = Number(numValue.toFixed(precision.value));
+      switch (props.format) {
+        case "wan":
+          numValue = numMulti(numValue, 1e4);
+          break;
+        case "million":
+          numValue = numMulti(numValue, 1e6);
+          break;
+        case "percentage":
+          numValue = numDiv(numValue, 100);
+          break;
+        case "permillage":
+          numValue = numDiv(numValue, 1e3);
+          break;
+        case "permillion":
+          numValue = numDiv(numValue, 1e4);
+          break;
+      }
+      const effectiveMax = props.maxValue != null ? props.maxValue : 999999999999999;
+      const effectiveMin = props.minValue != null ? props.minValue : -999999999999999;
+      numValue = Math.max(effectiveMin, Math.min(effectiveMax, numValue));
+      compValue.value = numValue;
       switch (props.format) {
         case "wan":
           textValue.value = numDiv(numValue, 1e4);
@@ -308,42 +336,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         textValue.value = delcommafy(textValue.value);
       }
     };
-    function handlerValue(value) {
-      if (!value && value !== 0) {
-        compValue.value = value;
-        return;
-      }
-      let cleanValue = delcommafy(value.toString());
-      let numValue2 = Number(cleanValue);
-      if (isNaN(numValue2)) return;
-      numValue2 = Number(numValue2.toFixed(precision.value));
-      switch (props.format) {
-        case "wan":
-          numValue2 = numMulti(numValue2, 1e4);
-          break;
-        case "million":
-          numValue2 = numMulti(numValue2, 1e6);
-          break;
-        case "percentage":
-          numValue2 = numDiv(numValue2, 100);
-          break;
-        case "permillage":
-          numValue2 = numDiv(numValue2, 1e3);
-          break;
-        case "permillion":
-          numValue2 = numDiv(numValue2, 1e4);
-          break;
-      }
-      const effectiveMax = props.maxValue != null ? props.maxValue : 999999999999999;
-      const effectiveMin = props.minValue != null ? props.minValue : -999999999999999;
-      numValue2 = Math.max(effectiveMin, Math.min(effectiveMax, numValue2));
-      compValue.value = numValue2;
-    }
-    function formatNumberWithComma(numValue2) {
-      if (isNaN(numValue2) || numValue2 === null || numValue2 === void 0) {
-        return numValue2;
+    function formatNumberWithComma(numValue) {
+      if (isNaN(numValue) || numValue === null || numValue === void 0) {
+        return numValue;
       }
-      let numStr = numValue2.toString();
+      let numStr = numValue.toString();
       const endsWithDot = numStr.endsWith(".");
       const [integerPart, decimalPart] = numStr.split(".");
       const formattedInteger = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
@@ -507,7 +504,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Number = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7b177c06"]]);
+const _Number = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-01611195"]]);
 export {
   _Number as default
 };

package/es/packages/vue/src/components/table/DynamicQuery.vue.mjs

@@ -266,6 +266,14 @@ const _sfc_main = {
       }
       return `${placeholderMap[field.fieldType] || "请输入"}${field.label || ""}`;
     };
+    const dynamicPlaceholder = computed(() => {
+      const searchFields = dynamicConfig.value.searchFields || [];
+      if (searchFields.length == 0) {
+        return "请输入筛选条件";
+      }
+      const labelArr = searchFields.map((item) => item.label);
+      return `搜索${labelArr.join("/")}`;
+    });
     return (_ctx, _cache) => {
       const _component_el_icon = ElIcon;
       const _component_el_tab_pane = ElTabPane;
@@ -317,7 +325,8 @@ const _sfc_main = {
               createVNode(_component_el_input, {
                 modelValue: searchInputValue.value,
                 "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => searchInputValue.value = $event),
-                placeholder: "请输入查询条件",
+                placeholder: dynamicPlaceholder.value,
+                title: dynamicPlaceholder.value,
                 class: "search-input",
                 clearable: "",
                 size: "default",
@@ -351,7 +360,7 @@ const _sfc_main = {
                   ]),
                   key: "0"
                 } : void 0
-              ]), 1032, ["modelValue"])
+              ]), 1032, ["modelValue", "placeholder", "title"])
             ])) : createCommentVNode("", true),
             !__props.readOnly && !__props.isSubTable && rightButtons.value.length > 0 ? (openBlock(), createBlock(unref(VxeToolbar), {
               key: 1,
@@ -485,7 +494,7 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ba490486"]]);
+const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b94368c6"]]);
 export {
   DynamicQuery as default
 };

package/es/packages/vue/src/utils/parseFilterConfig.mjs

@@ -14,6 +14,9 @@ function checkFilterMatch(filterConfig, data, fields = []) {
 }
 function checkGroupMatch(group, data, fields) {
   const { operator, conditions, groups } = group;
+  if ((!conditions || conditions.length == 0) && !groups || groups.length == 0) {
+    return true;
+  }
   const results = [];
   if (conditions && conditions.length > 0) {
     conditions.forEach((cond) => {

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.5.83";
+const version = "5.5.85";
 const packageJson = {
   version
 };

package/lib/designer/src/components/DocumentParam.vue.js

@@ -11,7 +11,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const Vue = require("vue");
 const index$2 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
-const ValueSelector = require("./ValueSelector.vue.js");
+const ValueSelector = require("./ValueSelector.vue2.js");
 const index = require("../api/index.js");
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");

package/lib/designer/src/components/ParamsConfig.vue2.js

@@ -6,7 +6,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const Vue = require("vue");
 const index$1 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
-const ValueSelector = require("./ValueSelector.vue.js");
+const ValueSelector = require("./ValueSelector.vue2.js");
 ;/* empty css                  */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../node_modules/element-plus/es/components/button/index.js");

package/lib/designer/src/layout/aside/HiddenFieldDialog.vue.js

@@ -18,7 +18,7 @@ const index$2 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 const common = require("../../packages/utils/common.js");
 const index$5 = require("../../packages/form/aside/index.js");
 const index$6 = require("../../packages/table/aside/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../components/ValueSelector.vue2.js");
 ;/* empty css                        */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/element-plus/es/components/dialog/index.js");

package/lib/designer/src/packages/advancedFilter/ValueInput.vue2.js

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js");
 const Vue = require("vue");
 const index = require("../../../../node_modules/@vueuse/core/dist/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../components/ValueSelector.vue2.js");
 const index$1 = require("../../api/index.js");
 const common = require("../utils/common.js");
 const datasource = require("../utils/datasource.js");

package/lib/designer/src/packages/dataLinkage/index.vue.js

@@ -32,7 +32,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js
 ;/* empty css                                                              */
 ;/* empty css                                         */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
-;/* empty css                                   */
+;/* empty css                                  */
 const index$8 = require("../../api/index.js");
 ;/* empty css                                                              */
 ;/* empty css                                                                */

package/lib/designer/src/packages/dialog/useDialogDialog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index.vue2.js");
+const index = require("./index.vue.js");
 const Vue = require("vue");
 function useDialogDialog() {
   const dialogDialogVisible = Vue.ref(false);

package/lib/designer/src/packages/dialogGlobal/index.vue.js

@@ -86,7 +86,7 @@ const widgets = require("../table/property/widgets.vue.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
 ;/* empty css                                                              */
 ;/* empty css                                         */
-;/* empty css                                   */
+;/* empty css                                  */
 ;/* empty css                                                            */
 ;/* empty css                                                            */
 ;/* empty css                             */

package/lib/designer/src/packages/dialogGlobal/useDialogGlobalDialog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index.vue2.js");
+const index = require("./index.vue.js");
 const Vue = require("vue");
 function useDialogGlobalDialog() {
   const dialogGlobalDialogVisible = Vue.ref(false);

package/lib/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.js

@@ -6,7 +6,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                     */
 const Vue = require("vue");
 const RiskSchemeSelector = require("../../../../components/RiskSchemeSelector.vue2.js");
-const ValueSelector = require("../../../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../../../components/ValueSelector.vue2.js");
 const ParamsConfig = require("../../../../components/ParamsConfig.vue2.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$1 = require("../../../../../../node_modules/element-plus/es/components/switch/index.js");

package/lib/designer/src/packages/form/property/approvalHistory.vue.js

@@ -13,7 +13,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 const Vue = require("vue");
 const common = require("../../utils/common.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../../components/ValueSelector.vue2.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$2 = require("../../../../../node_modules/element-plus/es/components/input/index.js");

package/lib/designer/src/packages/form/property/contract.vue.js

@@ -19,7 +19,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 const Vue = require("vue");
 const common = require("../../utils/common.js");
 require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../../components/ValueSelector.vue2.js");
 const index = require("../../../api/index.js");
 const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 ;/* empty css               */

package/lib/designer/src/packages/form/property/subForm.vue.js

@@ -14,7 +14,7 @@ const Vue = require("vue");
 const common = require("../../utils/common.js");
 const TemplateSelector = require("../../../components/TemplateSelector.vue2.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../../components/ValueSelector.vue2.js");
 const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");

package/lib/designer/src/packages/form/property/widgets.vue.js

@@ -54,8 +54,8 @@ const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_exp
 require("../../../components/TemplateSelector.vue.js");
 require("../../table/default.js");
 ;/* empty css                                 */
-;/* empty css                      */
-;/* empty css                            */
+;/* empty css                       */
+;/* empty css                             */
 require("../../../store/index.js");
 ;/* empty css              */
 const index$2 = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");

package/lib/designer/src/packages/prod/index.vue.js

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/es/index.js");
 const Vue = require("vue");
 const index$6 = require("../../../../node_modules/@element-plus/icons-vue/dist/index.js");
 const common = require("../utils/common.js");
-const ValueSelector = require("../../components/ValueSelector.vue.js");
+const ValueSelector = require("../../components/ValueSelector.vue2.js");
 const index = require("../../api/index.js");
 ;/* empty css            */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");

package/lib/designer/src/packages/table/headerBtn.vue.js

@@ -47,7 +47,7 @@ const index$1 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 ;/* empty css                                                              */
 require("../../store/index.js");
 ;/* empty css                                         */
-;/* empty css                                   */
+;/* empty css                                  */
 ;/* empty css                                 */
 ;/* empty css                                                            */
 ;/* empty css                                                               */

package/lib/designer/src/packages/table/queryModule/DynamicModeConfig.vue.js

@@ -256,6 +256,14 @@ const _sfc_main = {
         optionsMap[filterField.fieldId] = [];
       }
     }
+    const dynamicPlaceholder = Vue.computed(() => {
+      const searchFields = dynamicConfig.value.searchFields || [];
+      if (searchFields.length == 0) {
+        return "请输入筛选条件";
+      }
+      const labelArr = searchFields.map((item) => item.label);
+      return `搜索${labelArr.join("/")}`;
+    });
     return (_ctx, _cache) => {
       const _component_el_icon = index.ElIcon;
       const _component_el_tab_pane = index$2.ElTabPane;
@@ -303,7 +311,8 @@ const _sfc_main = {
           Vue.createElementVNode("div", _hoisted_6, [
             __props.enabled ? (Vue.openBlock(), Vue.createElementBlock("div", _hoisted_7, [
               Vue.createVNode(_component_el_input, {
-                placeholder: "请输入查询条件",
+                placeholder: dynamicPlaceholder.value,
+                title: dynamicPlaceholder.value,
                 class: "search-input"
               }, Vue.createSlots({
                 suffix: Vue.withCtx(() => [
@@ -331,7 +340,7 @@ const _sfc_main = {
                   ]),
                   key: "0"
                 } : void 0
-              ]), 1024)
+              ]), 1032, ["placeholder", "title"])
             ])) : Vue.createCommentVNode("", true),
             Vue.createVNode(Vue.unref(vueDraggablePlus.VueDraggable), {
               modelValue: editConfigData.value.customBtns.right,
@@ -508,5 +517,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f2c50fdc"]]);
+const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-93791225"]]);
 exports.default = DynamicModeConfig;