@fecp/designer 5.5.18 → 5.5.20

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.18";
+const version = "5.5.20";
 const packageJson = {
   version
 };

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

@@ -11,7 +11,7 @@ import "../../../_virtual/dayjs.min.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.vue.mjs";
+import ValueSelector from "./ValueSelector.vue2.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

@@ -6,7 +6,7 @@ import "../../../_virtual/dayjs.min.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.vue.mjs";
+import ValueSelector from "./ValueSelector.vue2.mjs";
 /* empty css                  */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
 const _hoisted_1 = { class: "params-config-container" };

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

@@ -1,11 +1,9 @@
 import { computed, createBlock, openBlock, resolveDynamicComponent, withCtx, createVNode } from "vue";
-import "../../../node_modules/element-plus/es/index.mjs";
+import { ElInputTag, ElInput } from "element-plus";
 import ValueSelectorPopover from "./ValueSelectorPopover.vue2.mjs";
 import { getEditConfigData, getEditConfigDataFields } from "../packages/utils/common.mjs";
 /* empty css                   */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-import { ElInputTag } from "../../../node_modules/element-plus/es/components/input-tag/index.mjs";
-import { ElInput } from "../../../node_modules/element-plus/es/components/input/index.mjs";
 const _sfc_main = {
   __name: "ValueSelector",
   props: {

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

@@ -21,7 +21,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 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.vue.mjs";
+import ValueSelector from "../../components/ValueSelector.vue2.mjs";
 /* empty css                        */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 const _hoisted_1 = { class: "action-bar" };

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

@@ -18,7 +18,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.vue.mjs";
+import ValueSelector from "../../components/ValueSelector.vue2.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

@@ -38,7 +38,7 @@ import "element-plus";
 /* empty css                                                              */
 /* empty css                                         */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
-/* empty css                                   */
+/* empty css                                  */
 /* empty css                                                              */
 /* empty css                                                                */
 /* empty css                                */

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

@@ -99,7 +99,7 @@ import widgets from "../table/property/widgets.vue.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                              */
 /* empty css                                         */
-/* empty css                                   */
+/* empty css                                  */
 /* empty css                                                            */
 /* empty css                                                            */
 /* empty css                             */

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

@@ -6,7 +6,7 @@ import "../../../../../../_virtual/dayjs.min.mjs";
 /* empty css                                                                     */
 import { createElementBlock, openBlock, Fragment, createVNode, withCtx } from "vue";
 import RiskSchemeSelector from "../../../../components/RiskSchemeSelector.vue2.mjs";
-import ValueSelector from "../../../../components/ValueSelector.vue.mjs";
+import ValueSelector from "../../../../components/ValueSelector.vue2.mjs";
 import ParamsConfig from "../../../../components/ParamsConfig.vue2.mjs";
 const _sfc_main = {
   __name: "RiskSch",

package/es/designer/src/packages/form/components/DefaultValueEditor.vue.mjs

@@ -22,6 +22,8 @@ const _sfc_main = {
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
+    const currentInstance = getCurrentInstance();
+    const ctx = currentInstance.proxy;
     const props = __props;
     const emit = __emit;
     const instance = getCurrentInstance();
@@ -83,7 +85,7 @@ const _sfc_main = {
     };
   }
 };
-const DefaultValueEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2b89d5b3"]]);
+const DefaultValueEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7742453a"]]);
 export {
   DefaultValueEditor as default
 };

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

@@ -15,7 +15,7 @@ import "../../../../../_virtual/dayjs.min.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.vue.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
 const _sfc_main = {
   __name: "approvalHistory",
   setup(__props) {

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

@@ -22,7 +22,7 @@ import "../../../../../_virtual/dayjs.min.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.vue.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue2.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

@@ -16,7 +16,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.vue.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 const _sfc_main = {
   __name: "subForm",

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

@@ -18,7 +18,7 @@ import "../../../../_virtual/dayjs.min.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.vue.mjs";
+import ValueSelector from "../../components/ValueSelector.vue2.mjs";
 import { ElMessage } from "element-plus";
 import api from "../../api/index.mjs";
 /* empty css            */

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

@@ -47,7 +47,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

@@ -3236,16 +3236,16 @@ to {
 .dev-root-header .opt-btn-content {
   height: 100%;
 }
-.default-value-editor[data-v-2b89d5b3] {
+.default-value-editor[data-v-7742453a] {
   width: 100%;
 }
-.default-value-editor[data-v-2b89d5b3] .el-input,
-.default-value-editor[data-v-2b89d5b3] .el-textarea,
-.default-value-editor[data-v-2b89d5b3] .el-date-editor,
-.default-value-editor[data-v-2b89d5b3] .el-select,
-.default-value-editor[data-v-2b89d5b3] .el-radio-group,
-.default-value-editor[data-v-2b89d5b3] .el-checkbox-group,
-.default-value-editor[data-v-2b89d5b3] .el-switch {
+.default-value-editor[data-v-7742453a] .el-input,
+.default-value-editor[data-v-7742453a] .el-textarea,
+.default-value-editor[data-v-7742453a] .el-date-editor,
+.default-value-editor[data-v-7742453a] .el-select,
+.default-value-editor[data-v-7742453a] .el-radio-group,
+.default-value-editor[data-v-7742453a] .el-checkbox-group,
+.default-value-editor[data-v-7742453a] .el-switch {
   width: 100%;
 }
 

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -1,5 +1,6 @@
 import { createDataSource } from "../datasource.mjs";
 import { parseRouteParams, parseSingleParamValue } from "../parseRouteParams.mjs";
+import { removeEmptyValues } from "../common.mjs";
 import { ElMessage } from "element-plus";
 import { openDialog } from "../../components/dialog/index.mjs";
 import { openRiskSch } from "../../components/riskSch/index.mjs";
@@ -545,6 +546,7 @@ async function handleFormSubmit(node, data, fields, context) {
         return result;
       }
       if (basic.returnToForm) {
+        formData = removeEmptyValues(result.data || {});
         delete formData.pageNo;
         delete formData.pageSize;
         const formComponent2 = (_f = context.components) == null ? void 0 : _f.form;

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.18";
+const version = "5.5.20";
 const packageJson = {
   version
 };

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

@@ -13,7 +13,7 @@ require("../../../_virtual/dayjs.min.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

@@ -8,7 +8,7 @@ require("../../../_virtual/dayjs.min.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 _hoisted_1 = { class: "params-config-container" };

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-require("../../../node_modules/element-plus/es/index.js");
+const ElementPlus = require("element-plus");
 const ValueSelectorPopover = require("./ValueSelectorPopover.vue2.js");
 const common = require("../packages/utils/common.js");
 ;/* empty css                   */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const index = require("../../../node_modules/element-plus/es/components/input-tag/index.js");
-const index$1 = require("../../../node_modules/element-plus/es/components/input/index.js");
 const _sfc_main = {
   __name: "ValueSelector",
   props: {
@@ -49,7 +47,7 @@ const _sfc_main = {
     const props = __props;
     const emit = __emit;
     const inputComponent = vue.computed(() => {
-      return props.multiple ? index.ElInputTag : index$1.ElInput;
+      return props.multiple ? ElementPlus.ElInputTag : ElementPlus.ElInput;
     });
     const hiddenFieldsData = vue.computed(() => {
       const editConfigData = common.getEditConfigData();

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

@@ -23,7 +23,7 @@ const ElementPlus = require("element-plus");
 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 _hoisted_1 = { class: "action-bar" };

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

@@ -20,7 +20,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

@@ -40,7 +40,7 @@ require("element-plus");
 ;/* empty css                                                              */
 ;/* empty css                                         */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
-;/* empty css                                   */
+;/* empty css                                  */
 ;/* empty css                                                              */
 ;/* empty css                                                                */
 ;/* empty css                                */

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

@@ -101,7 +101,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/eventFlow/dialog/action/RiskSch.vue.js

@@ -8,7 +8,7 @@ require("../../../../../../_virtual/dayjs.min.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 _sfc_main = {
   __name: "RiskSch",

package/lib/designer/src/packages/form/components/DefaultValueEditor.vue.js

@@ -24,6 +24,8 @@ const _sfc_main = {
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
+    const currentInstance = vue.getCurrentInstance();
+    const ctx = currentInstance.proxy;
     const props = __props;
     const emit = __emit;
     const instance = vue.getCurrentInstance();
@@ -85,5 +87,5 @@ const _sfc_main = {
     };
   }
 };
-const DefaultValueEditor = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2b89d5b3"]]);
+const DefaultValueEditor = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7742453a"]]);
 exports.default = DefaultValueEditor;

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

@@ -17,7 +17,7 @@ require("../../../../../_virtual/dayjs.min.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 _sfc_main = {
   __name: "approvalHistory",
   setup(__props) {

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

@@ -24,7 +24,7 @@ require("../../../../../_virtual/dayjs.min.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

@@ -18,7 +18,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 _sfc_main = {
   __name: "subForm",

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

@@ -20,7 +20,7 @@ require("../../../../_virtual/dayjs.min.js");
 const vue = require("vue");
 const index$5 = 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 ElementPlus = require("element-plus");
 const index = require("../../api/index.js");
 ;/* empty css            */

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

@@ -49,7 +49,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

@@ -3236,16 +3236,16 @@ to {
 .dev-root-header .opt-btn-content {
   height: 100%;
 }
-.default-value-editor[data-v-2b89d5b3] {
+.default-value-editor[data-v-7742453a] {
   width: 100%;
 }
-.default-value-editor[data-v-2b89d5b3] .el-input,
-.default-value-editor[data-v-2b89d5b3] .el-textarea,
-.default-value-editor[data-v-2b89d5b3] .el-date-editor,
-.default-value-editor[data-v-2b89d5b3] .el-select,
-.default-value-editor[data-v-2b89d5b3] .el-radio-group,
-.default-value-editor[data-v-2b89d5b3] .el-checkbox-group,
-.default-value-editor[data-v-2b89d5b3] .el-switch {
+.default-value-editor[data-v-7742453a] .el-input,
+.default-value-editor[data-v-7742453a] .el-textarea,
+.default-value-editor[data-v-7742453a] .el-date-editor,
+.default-value-editor[data-v-7742453a] .el-select,
+.default-value-editor[data-v-7742453a] .el-radio-group,
+.default-value-editor[data-v-7742453a] .el-checkbox-group,
+.default-value-editor[data-v-7742453a] .el-switch {
   width: 100%;
 }
 

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -2,6 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const datasource = require("../datasource.js");
 const parseRouteParams = require("../parseRouteParams.js");
+const common = require("../common.js");
 const ElementPlus = require("element-plus");
 const index$2 = require("../../components/dialog/index.js");
 const index = require("../../components/riskSch/index.js");
@@ -547,6 +548,7 @@ async function handleFormSubmit(node, data, fields, context) {
         return result;
       }
       if (basic.returnToForm) {
+        formData = common.removeEmptyValues(result.data || {});
         delete formData.pageNo;
         delete formData.pageSize;
         const formComponent2 = (_f = context.components) == null ? void 0 : _f.form;

package/package.json

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