@fecp/designer 5.5.85 → 5.5.87

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.85";
+const version = "5.5.87";
 const packageJson = {
   version
 };

package/es/designer/src/components/DocumentParam.vue.mjs

@@ -9,7 +9,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                            */
 import { getCurrentInstance, computed, ref, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
 import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
-import ValueSelector from "./ValueSelector.vue2.mjs";
+import ValueSelector from "./ValueSelector.vue.mjs";
 import api from "../api/index.mjs";
 /* empty css                    */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";

package/es/designer/src/components/ParamsConfig.vue2.mjs

@@ -4,7 +4,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                            */
 import { computed, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
 import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
-import ValueSelector from "./ValueSelector.vue2.mjs";
+import ValueSelector from "./ValueSelector.vue.mjs";
 /* empty css                  */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElButton } from "../../../node_modules/element-plus/es/components/button/index.mjs";

package/es/designer/src/layout/aside/HiddenFieldDialog.vue.mjs

@@ -16,7 +16,7 @@ import { Plus as plus_default, RefreshRight as refresh_right_default, Delete as
 import { getEditConfigData, getEditingType, cloneDeep, getEditConfigDataFields } from "../../packages/utils/common.mjs";
 import { defaultProperty } from "../../packages/form/aside/index.mjs";
 import { defaultProperty as defaultProperty$1 } from "../../packages/table/aside/index.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 /* empty css                        */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElDialog } from "../../../../node_modules/element-plus/es/components/dialog/index.mjs";

package/es/designer/src/packages/advancedFilter/ValueInput.vue2.mjs

@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs";
 import { getCurrentInstance, computed, watch, ref, createElementBlock, unref, openBlock, createBlock, isRef, createVNode, createElementVNode, withCtx, Fragment, renderList } from "vue";
 import { useVModel } from "../../../../node_modules/@vueuse/core/dist/index.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 import api from "../../api/index.mjs";
 import { getEditConfigDataSources } from "../utils/common.mjs";
 import { createDataSource } from "../utils/datasource.mjs";

package/es/designer/src/packages/dataLinkage/index.vue.mjs

@@ -30,7 +30,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
 /* empty css                                                              */
 /* empty css                                         */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
-/* empty css                                  */
+/* empty css                                   */
 import api from "../../api/index.mjs";
 /* empty css                                                              */
 /* empty css                                                                */

package/es/designer/src/packages/dialog/useDialogDialog.mjs

@@ -1,4 +1,4 @@
-import DialogDialog from "./index.vue.mjs";
+import DialogDialog from "./index.vue2.mjs";
 import { ref } from "vue";
 function useDialogDialog() {
   const dialogDialogVisible = ref(false);

package/es/designer/src/packages/dialogGlobal/useDialogGlobalDialog.mjs

@@ -1,4 +1,4 @@
-import DialogGlobalDialog from "./index.vue.mjs";
+import DialogGlobalDialog from "./index.vue2.mjs";
 import { ref } from "vue";
 function useDialogGlobalDialog() {
   const dialogGlobalDialogVisible = ref(false);

package/es/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.mjs

@@ -4,7 +4,7 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                     */
 import { createElementBlock, openBlock, Fragment, createVNode, withCtx } from "vue";
 import RiskSchemeSelector from "../../../../components/RiskSchemeSelector.vue2.mjs";
-import ValueSelector from "../../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../../components/ParamsConfig.vue2.mjs";
 import { ElFormItem } from "../../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElSwitch } from "../../../../../../node_modules/element-plus/es/components/switch/index.mjs";

package/es/designer/src/packages/form/property/approvalHistory.vue.mjs

@@ -11,7 +11,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 import { computed, ref, watch, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment } from "vue";
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElInput } from "../../../../../node_modules/element-plus/es/components/input/index.mjs";

package/es/designer/src/packages/form/property/contract.vue.mjs

@@ -17,7 +17,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 import { getCurrentInstance, computed, ref, createBlock, openBlock, withCtx, createVNode, createTextVNode, createElementBlock, Fragment, renderList } from "vue";
 import { getCurrentItem } from "../../utils/common.mjs";
 import "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import api from "../../../api/index.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 /* empty css               */

package/es/designer/src/packages/form/property/subForm.vue.mjs

@@ -12,7 +12,7 @@ import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNo
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import TemplateSelector from "../../../components/TemplateSelector.vue2.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";

package/es/designer/src/packages/form/property/widgets.vue.mjs

@@ -52,8 +52,8 @@ import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import "../../../components/TemplateSelector.vue.mjs";
 import "../../table/default.mjs";
 /* empty css                                 */
-/* empty css                       */
-/* empty css                             */
+/* empty css                      */
+/* empty css                            */
 import "../../../store/index.mjs";
 /* empty css              */
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";

package/es/designer/src/packages/prod/index.vue.mjs

@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/es/index.mjs";
 import { getCurrentInstance, useModel, ref, watch, computed, createBlock, openBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, createTextVNode, unref } from "vue";
 import { Plus as plus_default } from "../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
 import { getEditConfigData, getEditConfigDataFields, setEditConfigData } from "../utils/common.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 import api from "../../api/index.mjs";
 /* empty css            */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";

package/es/designer/src/packages/table/headerBtn.vue.mjs

@@ -45,7 +45,7 @@ import { Connection as connection_default, Grid as grid_default, ChatLineSquare
 /* empty css                                                              */
 import "../../store/index.mjs";
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                 */
 /* empty css                                                            */
 /* empty css                                                               */

package/es/designer.css

@@ -6477,10 +6477,10 @@ body,
   border-radius: 5px;
   margin-right: 12px;
   margin-top: 2px;
-}.cell-content .cell-text[data-v-5138d230] {
+}.cell-content .cell-text[data-v-5eaca99e] {
   display: inline-block;
 }
-.cell-content .copy-icon[data-v-5138d230] {
+.cell-content .copy-icon[data-v-5eaca99e] {
   cursor: pointer;
   color: #909399;
   font-size: 14px;
@@ -6488,7 +6488,7 @@ body,
   top: 4px;
   margin-left: 4px;
 }
-.cell-content .copy-icon[data-v-5138d230]:hover {
+.cell-content .copy-icon[data-v-5eaca99e]:hover {
   color: #409eff;
 }.fec-table-filter[data-v-ba2f1878] {
   display: flex;

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

@@ -284,6 +284,10 @@ const _sfc_main = {
     });
     const isBtnDisabled = (row, item) => {
       if (!item.disableCondition) return false;
+      const { operator, conditions, groups } = item.disableCondition;
+      if ((!conditions || conditions.length == 0) && (!groups || groups.length == 0)) {
+        return false;
+      }
       return checkFilterMatch(item.disableCondition, row, props.fieldsData);
     };
     const optColumnWidth = computed(() => {
@@ -444,7 +448,7 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5138d230"]]);
+const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5eaca99e"]]);
 export {
   TableColumn as default
 };

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

@@ -14,9 +14,6 @@ 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.85";
+const version = "5.5.87";
 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.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.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.vue.js");
+const index = require("./index.vue2.js");
 const Vue = require("vue");
 function useDialogDialog() {
   const dialogDialogVisible = Vue.ref(false);

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.vue.js");
+const index = require("./index.vue2.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.vue2.js");
+const ValueSelector = require("../../../../components/ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.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.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.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.css

@@ -6477,10 +6477,10 @@ body,
   border-radius: 5px;
   margin-right: 12px;
   margin-top: 2px;
-}.cell-content .cell-text[data-v-5138d230] {
+}.cell-content .cell-text[data-v-5eaca99e] {
   display: inline-block;
 }
-.cell-content .copy-icon[data-v-5138d230] {
+.cell-content .copy-icon[data-v-5eaca99e] {
   cursor: pointer;
   color: #909399;
   font-size: 14px;
@@ -6488,7 +6488,7 @@ body,
   top: 4px;
   margin-left: 4px;
 }
-.cell-content .copy-icon[data-v-5138d230]:hover {
+.cell-content .copy-icon[data-v-5eaca99e]:hover {
   color: #409eff;
 }.fec-table-filter[data-v-ba2f1878] {
   display: flex;

package/lib/packages/vue/src/components/table/TableColumn.vue.js

@@ -286,6 +286,10 @@ const _sfc_main = {
     });
     const isBtnDisabled = (row, item) => {
       if (!item.disableCondition) return false;
+      const { operator, conditions, groups } = item.disableCondition;
+      if ((!conditions || conditions.length == 0) && (!groups || groups.length == 0)) {
+        return false;
+      }
       return parseFilterConfig.checkFilterMatch(item.disableCondition, row, props.fieldsData);
     };
     const optColumnWidth = Vue.computed(() => {
@@ -446,5 +450,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5138d230"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5eaca99e"]]);
 exports.default = TableColumn;

package/lib/packages/vue/src/utils/parseFilterConfig.js

@@ -16,9 +16,6 @@ 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/package.json

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