@fecp/designer 5.4.64 → 5.4.66

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.4.64";
+const version = "5.4.66";
 const packageJson = {
   version
 };

package/es/designer.css

@@ -5850,7 +5850,7 @@ body,
 [data-v-3657e72b] .el-form-item__label {
   padding: 0 8px 0 0;
 }
-.el-page-header.is-contentful .el-page-header__main{border-top:1px solid var(--el-border-color-light);margin-top:16px}.el-page-header__header{justify-content:space-between;align-items:center;line-height:24px;display:flex}.el-page-header__left{align-items:center;margin-right:40px;display:flex;position:relative}.el-page-header__back{cursor:pointer;align-items:center;display:flex}.el-page-header__left .el-divider--vertical{margin:0 16px}.el-page-header__icon{align-items:center;margin-right:10px;font-size:16px;display:flex}.el-page-header__icon .el-icon{font-size:inherit}.el-page-header__title{font-size:14px;font-weight:500}.el-page-header__content{color:var(--el-text-color-primary);font-size:18px}.el-page-header__breadcrumb{margin-bottom:16px}.fec-header[data-v-b7c0507e] {
+.el-page-header.is-contentful .el-page-header__main{border-top:1px solid var(--el-border-color-light);margin-top:16px}.el-page-header__header{justify-content:space-between;align-items:center;line-height:24px;display:flex}.el-page-header__left{align-items:center;margin-right:40px;display:flex;position:relative}.el-page-header__back{cursor:pointer;align-items:center;display:flex}.el-page-header__left .el-divider--vertical{margin:0 16px}.el-page-header__icon{align-items:center;margin-right:10px;font-size:16px;display:flex}.el-page-header__icon .el-icon{font-size:inherit}.el-page-header__title{font-size:14px;font-weight:500}.el-page-header__content{color:var(--el-text-color-primary);font-size:18px}.el-page-header__breadcrumb{margin-bottom:16px}.fec-header[data-v-9c9b2c67] {
   padding: 0 20px;
   background-color: #fff;
   border-bottom: 1px solid #e4e7ed;
@@ -5859,33 +5859,36 @@ body,
   align-items: center;
   flex-shrink: 0;
 }
-.fec-header[data-v-b7c0507e] .el-page-header__header {
+.fec-header[data-v-9c9b2c67] .el-page-header__header {
   height: 100%;
   width: 100%;
   display: flex;
   align-items: center;
 }
-.fec-header[data-v-b7c0507e] .el-page-header__header .el-page-header__title {
+.fec-header[data-v-9c9b2c67] .el-page-header__header .el-page-header__title {
   display: none;
 }
-.fec-header[data-v-b7c0507e] .el-page-header__header .el-page-header__icon {
+.fec-header[data-v-9c9b2c67] .el-page-header__header .el-page-header__icon {
   margin-right: 0;
   font-size: 16px;
 }
-.fec-header .fec-header__title[data-v-b7c0507e] {
+.fec-header .fec-header__title[data-v-9c9b2c67] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
   margin-right: 12px;
 }
-.fec-header .fec-header__subtitle[data-v-b7c0507e] {
+.fec-header .fec-header__subtitle[data-v-9c9b2c67] {
   font-size: 12px;
   color: #606266;
 }
-.can-not-back[data-v-b7c0507e] .el-subTitle {
+.can-not-back[data-v-9c9b2c67] .el-subTitle {
   display: none;
 }
-[data-v-b7c0507e] .el-page-header__content {
+.can-not-back[data-v-9c9b2c67] .el-divider {
+  display: none;
+}
+[data-v-9c9b2c67] .el-page-header__content {
   color: #606266;
   font-size: 14px;
   line-height: 1.5;
@@ -5904,27 +5907,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-5e17ab81] {
+.fec-form[data-v-93f83bd7] {
   height: 100%;
 }
-[data-v-5e17ab81] .vgl-item {
+[data-v-93f83bd7] .vgl-item {
   transition: none;
 }
-[data-v-5e17ab81] .vgl-item > .el-form-item {
+[data-v-93f83bd7] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-5e17ab81] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-93f83bd7] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-5e17ab81] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-93f83bd7] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-5e17ab81] .vgl-item > .el-container {
+[data-v-93f83bd7] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;
@@ -6260,18 +6263,18 @@ body,
   max-height: 90% !important;
   padding: 0 !important;
 }
-.fec-layout-row[data-v-09545121] {
+.fec-layout-row[data-v-5bbe4a19] {
   width: 100%;
   height: 100%;
   overflow: hidden;
 }
-.fec-layout-row[data-v-09545121] .el-col {
+.fec-layout-row[data-v-5bbe4a19] .el-col {
   height: 100%;
 }
-.fec-layout-row[data-v-09545121] .el-col .el-scrollbar__bar {
+.fec-layout-row[data-v-5bbe4a19] .el-col .el-scrollbar__bar {
   display: none;
 }
-.grid-content[data-v-09545121] {
+.grid-content[data-v-5bbe4a19] {
   border-radius: 9px 9px 4px 4px;
   background-color: #fff;
   position: relative;
@@ -6282,7 +6285,7 @@ body,
       padding: 16px 16px 16px 16px;
     } */
 }
-.grid-content-statistics[data-v-09545121] {
+.grid-content-statistics[data-v-5bbe4a19] {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -6293,7 +6296,7 @@ body,
     height: 100%;
   } */
 }
-.grid-content-statistics[data-v-09545121] .fec-layout-card:last-child {
+.grid-content-statistics[data-v-5bbe4a19] .fec-layout-card:last-child {
   margin-bottom: 0 !important;
   flex: 1;
 }

package/es/packages/vue/src/components/details/header/Header.vue.mjs

@@ -23,6 +23,10 @@ const _sfc_main = {
     isApproval: {
       type: Boolean,
       default: false
+    },
+    showBack: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["action-click"],
@@ -32,7 +36,10 @@ const _sfc_main = {
     const emit = __emit;
     const canBack = computed(() => {
       var _a;
-      return !props.isApproval && ((_a = props.pageHeaderConfig) == null ? void 0 : _a.canBack);
+      if (props.showBack) {
+        return !props.isApproval && ((_a = props.pageHeaderConfig) == null ? void 0 : _a.canBack);
+      }
+      return false;
     });
     const getButtonType = (btnStyle) => {
       return "primary";
@@ -105,7 +112,7 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b7c0507e"]]);
+const component = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9c9b2c67"]]);
 export {
   component as default
 };

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

@@ -1015,11 +1015,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         "data-version": "v5"
       }, {
         default: withCtx(() => [
-          !__props.isSubForm && !__props.isDialog ? (openBlock(), createBlock(unref(header), {
-            key: 0,
+          createVNode(unref(header), {
+            showBack: !__props.isSubForm && !__props.isDialog,
             isApproval: __props.isApproval,
             pageHeaderConfig: localConfig.value.pageHeaderConfig
-          }, null, 8, ["isApproval", "pageHeaderConfig"])) : createCommentVNode("", true),
+          }, null, 8, ["showBack", "isApproval", "pageHeaderConfig"]),
           createVNode(unref(main), null, {
             default: withCtx(() => [
               createVNode(_component_el_form, {
@@ -1076,7 +1076,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             _: 1
           }),
           !__props.isSubForm && !__props.isDialog && !__props.isApproval ? (openBlock(), createBlock(unref(footer), {
-            key: 1,
+            key: 0,
             formMode: formMode.value,
             pageFooterConfig: localConfig.value.pageFooterConfig,
             onCustomButtonClick: handleCustomButtonClick
@@ -1087,7 +1087,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5e17ab81"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-93f83bd7"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/layout/Layout.vue.mjs

@@ -27,16 +27,30 @@ const _sfc_main = {
     initFormData: {
       type: Object,
       default: {}
+    },
+    isDialog: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["loaded"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const layoutRowRef = ref();
     const formData = ref(props.initFormData);
     const emit = __emit;
     const showCard = ref(false);
     function loaded(option, formData2) {
       showCard.value = true;
+      const layoutEl = layoutRowRef.value.$el;
+      const parentElement = layoutEl.parentElement;
+      if (parentElement.classList.contains("el-dialog__body")) {
+        let offsetHeight = parentElement.offsetHeight - 20;
+        const cols = layoutEl.querySelectorAll(".el-col");
+        cols.forEach((col) => {
+          col.style.height = offsetHeight + "px";
+        });
+      }
       emit("loaded", cloneDeep(formData2));
     }
     return (_ctx, _cache) => {
@@ -46,7 +60,9 @@ const _sfc_main = {
       const _directive_fec_layout = resolveDirective("fec-layout");
       return withDirectives((openBlock(), createBlock(_component_el_row, {
         gutter: 8,
-        class: "fec-layout-row"
+        class: "fec-layout-row",
+        ref_key: "layoutRowRef",
+        ref: layoutRowRef
       }, {
         default: withCtx(() => [
           createVNode(_component_el_col, { span: 18 }, {
@@ -60,8 +76,9 @@ const _sfc_main = {
                       modelValue: unref(formData),
                       "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(formData) ? formData.value = $event : null),
                       onLoaded: loaded,
-                      initFormMode: __props.initFormMode
-                    }, null, 8, ["templateKey", "modelValue", "initFormMode"])
+                      initFormMode: __props.initFormMode,
+                      isDialog: __props.isDialog
+                    }, null, 8, ["templateKey", "modelValue", "initFormMode", "isDialog"])
                   ]),
                   _: 1
                 }, 512)
@@ -85,7 +102,7 @@ const _sfc_main = {
     };
   }
 };
-const _Layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-09545121"]]);
+const _Layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5bbe4a19"]]);
 export {
   _Layout 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.4.64";
+const version = "5.4.66";
 const packageJson = {
   version
 };

package/lib/designer.css

@@ -5850,7 +5850,7 @@ body,
 [data-v-3657e72b] .el-form-item__label {
   padding: 0 8px 0 0;
 }
-.el-page-header.is-contentful .el-page-header__main{border-top:1px solid var(--el-border-color-light);margin-top:16px}.el-page-header__header{justify-content:space-between;align-items:center;line-height:24px;display:flex}.el-page-header__left{align-items:center;margin-right:40px;display:flex;position:relative}.el-page-header__back{cursor:pointer;align-items:center;display:flex}.el-page-header__left .el-divider--vertical{margin:0 16px}.el-page-header__icon{align-items:center;margin-right:10px;font-size:16px;display:flex}.el-page-header__icon .el-icon{font-size:inherit}.el-page-header__title{font-size:14px;font-weight:500}.el-page-header__content{color:var(--el-text-color-primary);font-size:18px}.el-page-header__breadcrumb{margin-bottom:16px}.fec-header[data-v-b7c0507e] {
+.el-page-header.is-contentful .el-page-header__main{border-top:1px solid var(--el-border-color-light);margin-top:16px}.el-page-header__header{justify-content:space-between;align-items:center;line-height:24px;display:flex}.el-page-header__left{align-items:center;margin-right:40px;display:flex;position:relative}.el-page-header__back{cursor:pointer;align-items:center;display:flex}.el-page-header__left .el-divider--vertical{margin:0 16px}.el-page-header__icon{align-items:center;margin-right:10px;font-size:16px;display:flex}.el-page-header__icon .el-icon{font-size:inherit}.el-page-header__title{font-size:14px;font-weight:500}.el-page-header__content{color:var(--el-text-color-primary);font-size:18px}.el-page-header__breadcrumb{margin-bottom:16px}.fec-header[data-v-9c9b2c67] {
   padding: 0 20px;
   background-color: #fff;
   border-bottom: 1px solid #e4e7ed;
@@ -5859,33 +5859,36 @@ body,
   align-items: center;
   flex-shrink: 0;
 }
-.fec-header[data-v-b7c0507e] .el-page-header__header {
+.fec-header[data-v-9c9b2c67] .el-page-header__header {
   height: 100%;
   width: 100%;
   display: flex;
   align-items: center;
 }
-.fec-header[data-v-b7c0507e] .el-page-header__header .el-page-header__title {
+.fec-header[data-v-9c9b2c67] .el-page-header__header .el-page-header__title {
   display: none;
 }
-.fec-header[data-v-b7c0507e] .el-page-header__header .el-page-header__icon {
+.fec-header[data-v-9c9b2c67] .el-page-header__header .el-page-header__icon {
   margin-right: 0;
   font-size: 16px;
 }
-.fec-header .fec-header__title[data-v-b7c0507e] {
+.fec-header .fec-header__title[data-v-9c9b2c67] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
   margin-right: 12px;
 }
-.fec-header .fec-header__subtitle[data-v-b7c0507e] {
+.fec-header .fec-header__subtitle[data-v-9c9b2c67] {
   font-size: 12px;
   color: #606266;
 }
-.can-not-back[data-v-b7c0507e] .el-subTitle {
+.can-not-back[data-v-9c9b2c67] .el-subTitle {
   display: none;
 }
-[data-v-b7c0507e] .el-page-header__content {
+.can-not-back[data-v-9c9b2c67] .el-divider {
+  display: none;
+}
+[data-v-9c9b2c67] .el-page-header__content {
   color: #606266;
   font-size: 14px;
   line-height: 1.5;
@@ -5904,27 +5907,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-5e17ab81] {
+.fec-form[data-v-93f83bd7] {
   height: 100%;
 }
-[data-v-5e17ab81] .vgl-item {
+[data-v-93f83bd7] .vgl-item {
   transition: none;
 }
-[data-v-5e17ab81] .vgl-item > .el-form-item {
+[data-v-93f83bd7] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-5e17ab81] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-93f83bd7] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-5e17ab81] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-93f83bd7] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-5e17ab81] .vgl-item > .el-container {
+[data-v-93f83bd7] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;
@@ -6260,18 +6263,18 @@ body,
   max-height: 90% !important;
   padding: 0 !important;
 }
-.fec-layout-row[data-v-09545121] {
+.fec-layout-row[data-v-5bbe4a19] {
   width: 100%;
   height: 100%;
   overflow: hidden;
 }
-.fec-layout-row[data-v-09545121] .el-col {
+.fec-layout-row[data-v-5bbe4a19] .el-col {
   height: 100%;
 }
-.fec-layout-row[data-v-09545121] .el-col .el-scrollbar__bar {
+.fec-layout-row[data-v-5bbe4a19] .el-col .el-scrollbar__bar {
   display: none;
 }
-.grid-content[data-v-09545121] {
+.grid-content[data-v-5bbe4a19] {
   border-radius: 9px 9px 4px 4px;
   background-color: #fff;
   position: relative;
@@ -6282,7 +6285,7 @@ body,
       padding: 16px 16px 16px 16px;
     } */
 }
-.grid-content-statistics[data-v-09545121] {
+.grid-content-statistics[data-v-5bbe4a19] {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -6293,7 +6296,7 @@ body,
     height: 100%;
   } */
 }
-.grid-content-statistics[data-v-09545121] .fec-layout-card:last-child {
+.grid-content-statistics[data-v-5bbe4a19] .fec-layout-card:last-child {
   margin-bottom: 0 !important;
   flex: 1;
 }

package/lib/packages/vue/src/components/details/header/Header.vue.js

@@ -25,6 +25,10 @@ const _sfc_main = {
     isApproval: {
       type: Boolean,
       default: false
+    },
+    showBack: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["action-click"],
@@ -34,7 +38,10 @@ const _sfc_main = {
     const emit = __emit;
     const canBack = vue.computed(() => {
       var _a;
-      return !props.isApproval && ((_a = props.pageHeaderConfig) == null ? void 0 : _a.canBack);
+      if (props.showBack) {
+        return !props.isApproval && ((_a = props.pageHeaderConfig) == null ? void 0 : _a.canBack);
+      }
+      return false;
     });
     const getButtonType = (btnStyle) => {
       return "primary";
@@ -107,5 +114,5 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b7c0507e"]]);
+const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-9c9b2c67"]]);
 exports.default = component;

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

@@ -1017,11 +1017,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         "data-version": "v5"
       }, {
         default: vue.withCtx(() => [
-          !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.header), {
-            key: 0,
+          vue.createVNode(vue.unref(index$3.header), {
+            showBack: !__props.isSubForm && !__props.isDialog,
             isApproval: __props.isApproval,
             pageHeaderConfig: localConfig.value.pageHeaderConfig
-          }, null, 8, ["isApproval", "pageHeaderConfig"])) : vue.createCommentVNode("", true),
+          }, null, 8, ["showBack", "isApproval", "pageHeaderConfig"]),
           vue.createVNode(vue.unref(index$4.main), null, {
             default: vue.withCtx(() => [
               vue.createVNode(_component_el_form, {
@@ -1078,7 +1078,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             _: 1
           }),
           !__props.isSubForm && !__props.isDialog && !__props.isApproval ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.footer), {
-            key: 1,
+            key: 0,
             formMode: formMode.value,
             pageFooterConfig: localConfig.value.pageFooterConfig,
             onCustomButtonClick: handleCustomButtonClick
@@ -1089,5 +1089,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5e17ab81"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-93f83bd7"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/layout/Layout.vue.js

@@ -29,16 +29,30 @@ const _sfc_main = {
     initFormData: {
       type: Object,
       default: {}
+    },
+    isDialog: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["loaded"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const layoutRowRef = vue.ref();
     const formData = vue.ref(props.initFormData);
     const emit = __emit;
     const showCard = vue.ref(false);
     function loaded(option, formData2) {
       showCard.value = true;
+      const layoutEl = layoutRowRef.value.$el;
+      const parentElement = layoutEl.parentElement;
+      if (parentElement.classList.contains("el-dialog__body")) {
+        let offsetHeight = parentElement.offsetHeight - 20;
+        const cols = layoutEl.querySelectorAll(".el-col");
+        cols.forEach((col) => {
+          col.style.height = offsetHeight + "px";
+        });
+      }
       emit("loaded", common.cloneDeep(formData2));
     }
     return (_ctx, _cache) => {
@@ -48,7 +62,9 @@ const _sfc_main = {
       const _directive_fec_layout = vue.resolveDirective("fec-layout");
       return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_row, {
         gutter: 8,
-        class: "fec-layout-row"
+        class: "fec-layout-row",
+        ref_key: "layoutRowRef",
+        ref: layoutRowRef
       }, {
         default: vue.withCtx(() => [
           vue.createVNode(_component_el_col, { span: 18 }, {
@@ -62,8 +78,9 @@ const _sfc_main = {
                       modelValue: vue.unref(formData),
                       "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(formData) ? formData.value = $event : null),
                       onLoaded: loaded,
-                      initFormMode: __props.initFormMode
-                    }, null, 8, ["templateKey", "modelValue", "initFormMode"])
+                      initFormMode: __props.initFormMode,
+                      isDialog: __props.isDialog
+                    }, null, 8, ["templateKey", "modelValue", "initFormMode", "isDialog"])
                   ]),
                   _: 1
                 }, 512)
@@ -87,5 +104,5 @@ const _sfc_main = {
     };
   }
 };
-const _Layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-09545121"]]);
+const _Layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5bbe4a19"]]);
 exports.default = _Layout;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fecp/designer",
-  "version": "5.4.64",
+  "version": "5.4.66",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [
-    "es",
+    "es",                                             
     "lib"
   ],
   "scripts": {