@fecp/designer 5.5.32 → 5.5.34

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.32";
+const version = "5.5.34";
 const packageJson = {
   version
 };

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

@@ -53,7 +53,8 @@ const _sfc_main = {
       var _a;
       hiddenFields.value = (((_a = editConfigData.value) == null ? void 0 : _a.hiddenFields) || []).map(
         (field) => ({
-          ...field
+          ...field,
+          value: field.value || field.defaultValue
         })
       );
     };
@@ -166,6 +167,8 @@ const _sfc_main = {
         let currentY = maxY;
         selectedRows.value.forEach((field) => {
           let component = cloneDeep(field);
+          component.defaultValue = field.value;
+          delete component.value;
           component.id = component.id + "";
           component.fieldType = component.fieldType || "text";
           component.type = component.type || "widgets";
@@ -374,7 +377,7 @@ const _sfc_main = {
     };
   }
 };
-const HiddenFieldDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c3d621bb"]]);
+const HiddenFieldDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b2acaeb1"]]);
 export {
   HiddenFieldDialog as default
 };

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

@@ -1,4 +1,4 @@
-import DialogDialog from "./index.vue2.mjs";
+import DialogDialog from "./index.vue.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.vue2.mjs";
+import DialogGlobalDialog from "./index.vue.mjs";
 import { ref } from "vue";
 function useDialogGlobalDialog() {
   const dialogGlobalDialogVisible = ref(false);

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.css

@@ -127,37 +127,37 @@
 }
 .value-selector-input[data-v-e5b87efa] .el-input-tag__suffix {
   padding-right: 0;
-}.action-bar[data-v-c3d621bb] {
+}.action-bar[data-v-b2acaeb1] {
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin-bottom: 16px;
 }
-.action-bar .left-buttons[data-v-c3d621bb] {
+.action-bar .left-buttons[data-v-b2acaeb1] {
   display: flex;
   gap: 12px;
 }
-.action-bar .count-info[data-v-c3d621bb] {
+.action-bar .count-info[data-v-b2acaeb1] {
   color: #909399;
   font-size: 14px;
 }
-.field-list-container[data-v-c3d621bb] {
+.field-list-container[data-v-b2acaeb1] {
   margin-bottom: 16px;
 }
-.field-name-cell[data-v-c3d621bb] {
+.field-name-cell[data-v-b2acaeb1] {
   display: flex;
   align-items: center;
   gap: 8px;
   flex: 1;
 }
-.field-name-cell .el-input[data-v-c3d621bb] {
+.field-name-cell .el-input[data-v-b2acaeb1] {
   flex: 1;
 }
-.dialog-footer[data-v-c3d621bb] {
+.dialog-footer[data-v-b2acaeb1] {
   display: flex;
   justify-content: flex-end;
 }
-[data-v-c3d621bb] .el-table--fit .el-table__inner-wrapper:before {
+[data-v-b2acaeb1] .el-table--fit .el-table__inner-wrapper:before {
   display: none;
 }.root-aside[data-v-b7e9472b] {
   width: 300px;
@@ -5921,25 +5921,25 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-df445e35] {
+.fec-form[data-v-71dda23e] {
   height: 100%;
 }
-[data-v-df445e35] .vgl-layout {
+[data-v-71dda23e] .vgl-layout {
   position: relative;
 }
-[data-v-df445e35] .vgl-item {
+[data-v-71dda23e] .vgl-item {
   transition: none;
 }
-[data-v-df445e35] .vgl-item > .el-form-item {
+[data-v-71dda23e] .vgl-item > .el-form-item {
   width: 100%;
   padding: 6px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-df445e35] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-71dda23e] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-df445e35] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-71dda23e] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
@@ -5948,12 +5948,12 @@ body,
   flex-wrap: wrap;
   white-space: normal;
 }
-[data-v-df445e35] .vgl-item > .el-form-item {
+[data-v-71dda23e] .vgl-item > .el-form-item {
   /* .el-form-item__error {
     padding-top: 10px;
   } */
 }
-[data-v-df445e35] .vgl-item > .el-container {
+[data-v-71dda23e] .vgl-item > .el-container {
   height: auto !important;
 }.table-pagination[data-v-142fdd35] {
   display: flex;

package/es/packages/vue/src/components/bus/approvalHistory/timeLine.vue.mjs

@@ -289,7 +289,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                         node.signTaskList && node.signTaskList.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(node.signTaskList, (sign) => {
                           return openBlock(), createElementBlock("div", _hoisted_33, [
                             createElementVNode("div", _hoisted_34, [
-                              createElementVNode("span", _hoisted_35, toDisplayString(sign.approveName), 1),
+                              createElementVNode("span", _hoisted_35, toDisplayString(sign.approveName || "办理完成"), 1),
                               createElementVNode("span", _hoisted_36, "耗时：" + toDisplayString(sign.duration), 1)
                             ]),
                             sign.approveDesc ? (openBlock(), createElementBlock("div", _hoisted_37, [

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -593,7 +593,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const handleCustomButtonClick = (button) => {
       var _a;
       handleEvent.value(
-        formData.value,
+        getFormData(),
+        button,
+        (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
+      );
+    };
+    const handleActionClick = (button) => {
+      var _a;
+      handleEvent.value(
+        getFormData(),
         button,
         (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
       );
@@ -1022,7 +1030,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           createVNode(unref(header), {
             showBack: !__props.isSubForm && !__props.isDialog,
             isApproval: __props.isApproval,
-            pageHeaderConfig: localConfig.value.pageHeaderConfig
+            pageHeaderConfig: localConfig.value.pageHeaderConfig,
+            onActionClick: handleActionClick
           }, null, 8, ["showBack", "isApproval", "pageHeaderConfig"]),
           createVNode(unref(main), {
             scrollbar: !__props.isDialog
@@ -1094,7 +1103,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-df445e35"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-71dda23e"]]);
 export {
   _Form as default
 };

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

@@ -477,6 +477,7 @@ async function handleFormSetValue(node, data, fields, context) {
       delete formData[value];
     });
   }
+  formData = removeEmptyValues(formData);
   delete formData.pageNo;
   delete formData.pageSize;
   const formComponent = ((_a = context.components) == null ? void 0 : _a.form) || ((_b = context.components) == null ? void 0 : _b.table);

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

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

@@ -55,7 +55,8 @@ const _sfc_main = {
       var _a;
       hiddenFields.value = (((_a = editConfigData.value) == null ? void 0 : _a.hiddenFields) || []).map(
         (field) => ({
-          ...field
+          ...field,
+          value: field.value || field.defaultValue
         })
       );
     };
@@ -168,6 +169,8 @@ const _sfc_main = {
         let currentY = maxY;
         selectedRows.value.forEach((field) => {
           let component = common.cloneDeep(field);
+          component.defaultValue = field.value;
+          delete component.value;
           component.id = component.id + "";
           component.fieldType = component.fieldType || "text";
           component.type = component.type || "widgets";
@@ -376,5 +379,5 @@ const _sfc_main = {
     };
   }
 };
-const HiddenFieldDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-c3d621bb"]]);
+const HiddenFieldDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b2acaeb1"]]);
 exports.default = HiddenFieldDialog;

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/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/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.css

@@ -127,37 +127,37 @@
 }
 .value-selector-input[data-v-e5b87efa] .el-input-tag__suffix {
   padding-right: 0;
-}.action-bar[data-v-c3d621bb] {
+}.action-bar[data-v-b2acaeb1] {
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin-bottom: 16px;
 }
-.action-bar .left-buttons[data-v-c3d621bb] {
+.action-bar .left-buttons[data-v-b2acaeb1] {
   display: flex;
   gap: 12px;
 }
-.action-bar .count-info[data-v-c3d621bb] {
+.action-bar .count-info[data-v-b2acaeb1] {
   color: #909399;
   font-size: 14px;
 }
-.field-list-container[data-v-c3d621bb] {
+.field-list-container[data-v-b2acaeb1] {
   margin-bottom: 16px;
 }
-.field-name-cell[data-v-c3d621bb] {
+.field-name-cell[data-v-b2acaeb1] {
   display: flex;
   align-items: center;
   gap: 8px;
   flex: 1;
 }
-.field-name-cell .el-input[data-v-c3d621bb] {
+.field-name-cell .el-input[data-v-b2acaeb1] {
   flex: 1;
 }
-.dialog-footer[data-v-c3d621bb] {
+.dialog-footer[data-v-b2acaeb1] {
   display: flex;
   justify-content: flex-end;
 }
-[data-v-c3d621bb] .el-table--fit .el-table__inner-wrapper:before {
+[data-v-b2acaeb1] .el-table--fit .el-table__inner-wrapper:before {
   display: none;
 }.root-aside[data-v-b7e9472b] {
   width: 300px;
@@ -5921,25 +5921,25 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-df445e35] {
+.fec-form[data-v-71dda23e] {
   height: 100%;
 }
-[data-v-df445e35] .vgl-layout {
+[data-v-71dda23e] .vgl-layout {
   position: relative;
 }
-[data-v-df445e35] .vgl-item {
+[data-v-71dda23e] .vgl-item {
   transition: none;
 }
-[data-v-df445e35] .vgl-item > .el-form-item {
+[data-v-71dda23e] .vgl-item > .el-form-item {
   width: 100%;
   padding: 6px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-df445e35] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-71dda23e] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-df445e35] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-71dda23e] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
@@ -5948,12 +5948,12 @@ body,
   flex-wrap: wrap;
   white-space: normal;
 }
-[data-v-df445e35] .vgl-item > .el-form-item {
+[data-v-71dda23e] .vgl-item > .el-form-item {
   /* .el-form-item__error {
     padding-top: 10px;
   } */
 }
-[data-v-df445e35] .vgl-item > .el-container {
+[data-v-71dda23e] .vgl-item > .el-container {
   height: auto !important;
 }.table-pagination[data-v-142fdd35] {
   display: flex;

package/lib/packages/vue/src/components/bus/approvalHistory/timeLine.vue.js

@@ -291,7 +291,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                         node.signTaskList && node.signTaskList.length > 0 ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(node.signTaskList, (sign) => {
                           return vue.openBlock(), vue.createElementBlock("div", _hoisted_33, [
                             vue.createElementVNode("div", _hoisted_34, [
-                              vue.createElementVNode("span", _hoisted_35, vue.toDisplayString(sign.approveName), 1),
+                              vue.createElementVNode("span", _hoisted_35, vue.toDisplayString(sign.approveName || "办理完成"), 1),
                               vue.createElementVNode("span", _hoisted_36, "耗时：" + vue.toDisplayString(sign.duration), 1)
                             ]),
                             sign.approveDesc ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_37, [

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

@@ -595,7 +595,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const handleCustomButtonClick = (button) => {
       var _a;
       handleEvent.value(
-        formData.value,
+        getFormData(),
+        button,
+        (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
+      );
+    };
+    const handleActionClick = (button) => {
+      var _a;
+      handleEvent.value(
+        getFormData(),
         button,
         (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
       );
@@ -1024,7 +1032,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           vue.createVNode(vue.unref(index$3.header), {
             showBack: !__props.isSubForm && !__props.isDialog,
             isApproval: __props.isApproval,
-            pageHeaderConfig: localConfig.value.pageHeaderConfig
+            pageHeaderConfig: localConfig.value.pageHeaderConfig,
+            onActionClick: handleActionClick
           }, null, 8, ["showBack", "isApproval", "pageHeaderConfig"]),
           vue.createVNode(vue.unref(index$4.main), {
             scrollbar: !__props.isDialog
@@ -1096,5 +1105,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-df445e35"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-71dda23e"]]);
 exports.default = _Form;

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

@@ -479,6 +479,7 @@ async function handleFormSetValue(node, data, fields, context) {
       delete formData[value];
     });
   }
+  formData = common.removeEmptyValues(formData);
   delete formData.pageNo;
   delete formData.pageSize;
   const formComponent = ((_a = context.components) == null ? void 0 : _a.form) || ((_b = context.components) == null ? void 0 : _b.table);

package/package.json

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