@fecp/designer 5.5.93 → 5.5.95

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.93";
+const version = "5.5.95";
 const packageJson = {
   version
 };

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/index.vue.mjs

@@ -84,7 +84,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/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/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

@@ -6272,15 +6272,15 @@ body,
   align-items: center;
   flex-wrap: nowrap;
 }
-.fec-form[data-v-d12d82a2] {
+.fec-form[data-v-60aa225e] {
   height: 100%;
 }
-.fec-form.inMinApp[data-v-d12d82a2] {
+.fec-form.inMinApp[data-v-60aa225e] {
   height: 0px;
   flex: 1;
   padding: 8px;
 }
-.fec-form-col[data-v-d12d82a2] {
+.fec-form-col[data-v-60aa225e] {
   padding: 0px !important;
   display: flex !important;
   flex-direction: column;
@@ -6289,22 +6289,22 @@ body,
   overflow: hidden;
   flex: auto !important;
 }
-[data-v-d12d82a2] .vgl-layout {
+[data-v-60aa225e] .vgl-layout {
   position: relative;
 }
-[data-v-d12d82a2] .vgl-item {
+[data-v-60aa225e] .vgl-item {
   transition: none;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item {
+[data-v-60aa225e] .vgl-item > .el-form-item {
   width: 100%;
   padding: 6px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-60aa225e] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: inline-flex;
   align-items: center;
@@ -6318,107 +6318,107 @@ body,
   flex-shrink: 0;
   min-height: 45px;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item {
+[data-v-60aa225e] .vgl-item > .el-form-item {
   /* .el-form-item__error {
     padding-top: 10px;
   } */
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item > .el-form-item .el-input__wrapper {
   padding: 1px 12px;
 }
-[data-v-d12d82a2] .vgl-item > .el-container {
+[data-v-60aa225e] .vgl-item > .el-container {
   height: auto !important;
 }
 @media (min-width: 1720px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 160px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 6px 8px 0 8px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 12px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 12px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 12px !important;
 }
 }
 /* 标准 PC（1200px ~ 1439px）*/
 @media (min-width: 1366px) and (max-width: 1719px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 130px !important;
     padding-right: 6px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 6px 0 0 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 8px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 8px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 8px !important;
 }
 }
 /* 2. 标准 PC 992px ~ 1199px */
 @media (min-width: 992px) and (max-width: 1365px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 125px !important;
     padding-right: 4px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 6px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 6px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 6px !important;
 }
 }
 /* 3. 小屏 PC / 窄窗口 <992px（最小到768px）*/
 @media (max-width: 991px) and (min-width: 768px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 100px !important;
     padding-right: 4px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 4px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 4px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 6px !important;
 }
 }
 /* 超小屏 <768px */
 @media (max-width: 767px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 80px !important;
     padding-right: 4px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 2px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 2px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 6px !important;
 }
 }.table-pagination[data-v-142fdd35] {

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

@@ -647,15 +647,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         (item) => item.isApproval
       );
     };
-    const handleApprovalEvent = () => {
+    const handleApprovalEvent = (isSubmit) => {
       return new Promise((resolve, reject) => {
         var _a, _b;
         const actions = ((_a = localConfig.value.pageFooterConfig) == null ? void 0 : _a.actions) || [];
         const approvalAction = actions.find((item) => item.isApproval);
         if (approvalAction) {
+          let action = { ...approvalAction };
+          if (!isSubmit) {
+            action.isApproval = false;
+          }
           handleEvent.value(
             formData.value,
-            approvalAction,
+            action,
             (_b = approvalAction.eventConfig) == null ? void 0 : _b.find((item) => item.name == "Click")
           ).then(() => {
             resolve();
@@ -1274,7 +1278,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d12d82a2"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-60aa225e"]]);
 export {
   _Form as default
 };

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

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

@@ -6272,15 +6272,15 @@ body,
   align-items: center;
   flex-wrap: nowrap;
 }
-.fec-form[data-v-d12d82a2] {
+.fec-form[data-v-60aa225e] {
   height: 100%;
 }
-.fec-form.inMinApp[data-v-d12d82a2] {
+.fec-form.inMinApp[data-v-60aa225e] {
   height: 0px;
   flex: 1;
   padding: 8px;
 }
-.fec-form-col[data-v-d12d82a2] {
+.fec-form-col[data-v-60aa225e] {
   padding: 0px !important;
   display: flex !important;
   flex-direction: column;
@@ -6289,22 +6289,22 @@ body,
   overflow: hidden;
   flex: auto !important;
 }
-[data-v-d12d82a2] .vgl-layout {
+[data-v-60aa225e] .vgl-layout {
   position: relative;
 }
-[data-v-d12d82a2] .vgl-item {
+[data-v-60aa225e] .vgl-item {
   transition: none;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item {
+[data-v-60aa225e] .vgl-item > .el-form-item {
   width: 100%;
   padding: 6px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-60aa225e] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: inline-flex;
   align-items: center;
@@ -6318,107 +6318,107 @@ body,
   flex-shrink: 0;
   min-height: 45px;
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item {
+[data-v-60aa225e] .vgl-item > .el-form-item {
   /* .el-form-item__error {
     padding-top: 10px;
   } */
 }
-[data-v-d12d82a2] .vgl-item > .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item > .el-form-item .el-input__wrapper {
   padding: 1px 12px;
 }
-[data-v-d12d82a2] .vgl-item > .el-container {
+[data-v-60aa225e] .vgl-item > .el-container {
   height: auto !important;
 }
 @media (min-width: 1720px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 160px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 6px 8px 0 8px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 12px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 12px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 12px !important;
 }
 }
 /* 标准 PC（1200px ~ 1439px）*/
 @media (min-width: 1366px) and (max-width: 1719px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 130px !important;
     padding-right: 6px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 6px 0 0 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 8px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 8px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 8px !important;
 }
 }
 /* 2. 标准 PC 992px ~ 1199px */
 @media (min-width: 992px) and (max-width: 1365px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 125px !important;
     padding-right: 4px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 6px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 6px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 6px !important;
 }
 }
 /* 3. 小屏 PC / 窄窗口 <992px（最小到768px）*/
 @media (max-width: 991px) and (min-width: 768px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 100px !important;
     padding-right: 4px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 4px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 4px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 6px !important;
 }
 }
 /* 超小屏 <768px */
 @media (max-width: 767px) {
-[data-v-d12d82a2] .vgl-item .el-form-item__label {
+[data-v-60aa225e] .vgl-item .el-form-item__label {
     max-width: 80px !important;
     padding-right: 4px !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item {
+[data-v-60aa225e] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 2px;
 }
-[data-v-d12d82a2] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-60aa225e] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 2px;
 }
-.fec-el-form[data-v-d12d82a2] {
+.fec-el-form[data-v-60aa225e] {
     padding: 6px !important;
 }
 }.table-pagination[data-v-142fdd35] {

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

@@ -649,15 +649,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         (item) => item.isApproval
       );
     };
-    const handleApprovalEvent = () => {
+    const handleApprovalEvent = (isSubmit) => {
       return new Promise((resolve, reject) => {
         var _a, _b;
         const actions = ((_a = localConfig.value.pageFooterConfig) == null ? void 0 : _a.actions) || [];
         const approvalAction = actions.find((item) => item.isApproval);
         if (approvalAction) {
+          let action = { ...approvalAction };
+          if (!isSubmit) {
+            action.isApproval = false;
+          }
           handleEvent.value(
             formData.value,
-            approvalAction,
+            action,
             (_b = approvalAction.eventConfig) == null ? void 0 : _b.find((item) => item.name == "Click")
           ).then(() => {
             resolve();
@@ -1276,5 +1280,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d12d82a2"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-60aa225e"]]);
 exports.default = _Form;

package/package.json

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