@fecp/designer 5.4.66 → 5.4.68

package/es/packages/mobile/src/components/navigation/navBar/NavBar.vue.mjs

@@ -13,6 +13,7 @@ const _sfc_main = {
       return openBlock(), createBlock(_component_van_nav_bar, mergeProps(_ctx.$attrs, {
         fixed: false,
         "safe-area-inset-top": "",
+        clickable: "",
         onClickLeft
       }), createSlots({ _: 2 }, [
         renderList(_ctx.$slots, (item, key) => {

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

@@ -4,7 +4,7 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                          */
 /* empty css                                                                     */
 import { computed, createBlock, createCommentVNode, openBlock, normalizeClass, unref, createSlots, withCtx, createElementVNode, toDisplayString, createElementBlock, Fragment, renderList, createTextVNode } from "vue";
-import { ArrowLeft as arrow_left_default } from "../../../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
+import { ArrowLeftBold as arrow_left_bold_default } from "../../../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
 import { getCurrentVueInstance } from "../../../utils/getInstance.mjs";
 /* empty css             */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
@@ -74,15 +74,15 @@ const _sfc_main = {
       const _component_el_page_header = ElPageHeader;
       return ((_a = __props.pageHeaderConfig) == null ? void 0 : _a.enabled) ? (openBlock(), createBlock(_component_el_page_header, {
         key: 0,
-        icon: unref(canBack) ? unref(arrow_left_default) : null,
+        icon: unref(canBack) ? unref(arrow_left_bold_default) : null,
         onBack: handleBack,
         class: normalizeClass(["fec-header", { "can-not-back": !unref(canBack) }])
       }, createSlots({
         content: withCtx(() => {
           var _a2, _b2;
           return [
-            createElementVNode("span", _hoisted_1, toDisplayString((_a2 = __props.pageHeaderConfig) == null ? void 0 : _a2.title), 1),
-            createElementVNode("span", _hoisted_2, toDisplayString((_b2 = __props.pageHeaderConfig) == null ? void 0 : _b2.subTitle), 1)
+            createElementVNode("div", _hoisted_1, toDisplayString((_a2 = __props.pageHeaderConfig) == null ? void 0 : _a2.title), 1),
+            createElementVNode("div", _hoisted_2, toDisplayString((_b2 = __props.pageHeaderConfig) == null ? void 0 : _b2.subTitle), 1)
           ];
         }),
         _: 2
@@ -112,7 +112,7 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9c9b2c67"]]);
+const component = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ed71ead2"]]);
 export {
   component as default
 };

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

@@ -1030,6 +1030,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 "label-position": localConfig.value.labelPosition,
                 style: normalizeStyle({ padding: __props.isSubForm || __props.isDialog ? "0" : "18px" }),
                 "validate-on-rule-change": false,
+                size: "large",
                 "scroll-to-error": ""
               }, {
                 default: withCtx(() => [
@@ -1087,7 +1088,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-93f83bd7"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6724c26e"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/forms/h2/H2.vue.mjs

@@ -36,7 +36,7 @@ const _sfc_main = {
     };
   }
 };
-const _H2 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6852826d"]]);
+const _H2 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2e23c430"]]);
 export {
   _H2 as default
 };

package/es/packages/vue/src/components/forms/subTitle/SubTitle.vue.mjs

@@ -21,7 +21,7 @@ const _sfc_main = {
     };
   }
 };
-const _SubTitle = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b0291d18"]]);
+const _SubTitle = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fa65f3d4"]]);
 export {
   _SubTitle as default
 };

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

@@ -27,10 +27,6 @@ const _sfc_main = {
     initFormData: {
       type: Object,
       default: {}
-    },
-    isDialog: {
-      type: Boolean,
-      default: false
     }
   },
   emits: ["loaded"],
@@ -40,6 +36,7 @@ const _sfc_main = {
     const formData = ref(props.initFormData);
     const emit = __emit;
     const showCard = ref(false);
+    const isDialog = ref(false);
     function loaded(option, formData2) {
       showCard.value = true;
       const layoutEl = layoutRowRef.value.$el;
@@ -50,6 +47,7 @@ const _sfc_main = {
         cols.forEach((col) => {
           col.style.height = offsetHeight + "px";
         });
+        isDialog.value = true;
       }
       emit("loaded", cloneDeep(formData2));
     }
@@ -77,7 +75,7 @@ const _sfc_main = {
                       "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(formData) ? formData.value = $event : null),
                       onLoaded: loaded,
                       initFormMode: __props.initFormMode,
-                      isDialog: __props.isDialog
+                      isDialog: unref(isDialog)
                     }, null, 8, ["templateKey", "modelValue", "initFormMode", "isDialog"])
                   ]),
                   _: 1
@@ -102,7 +100,7 @@ const _sfc_main = {
     };
   }
 };
-const _Layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5bbe4a19"]]);
+const _Layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b2246cdb"]]);
 export {
   _Layout as default
 };

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

@@ -126,7 +126,7 @@ const _sfc_main = {
         !__props.readOnly && !__props.isSubTable && hasButtons.value ? (openBlock(), createBlock(unref(VxeToolbar), {
           key: 2,
           ref: "toolbarRef",
-          style: { "flex": "1", "margin-bottom": "8px" }
+          style: { "flex": "1", "margin-bottom": "0", "padding": "0" }
         }, {
           buttons: withCtx(() => [
             leftButtons.value.length ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(leftButtons.value, (btn) => {
@@ -164,7 +164,7 @@ const _sfc_main = {
     };
   }
 };
-const CustomButtons = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fefc9244"]]);
+const CustomButtons = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9bffe68b"]]);
 export {
   CustomButtons as default
 };

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

@@ -105,7 +105,7 @@ const _sfc_main = {
     };
   }
 };
-const Pagination = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e9a95efa"]]);
+const Pagination = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2a21f226"]]);
 export {
   Pagination as default
 };

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

@@ -5,7 +5,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                  */
 /* empty css                                                                  */
 /* empty css                                                                */
-import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, withCtx, createElementBlock, createCommentVNode, normalizeStyle, createElementVNode, Fragment, createVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, normalizeClass, withCtx, createElementBlock, createCommentVNode, normalizeStyle, createElementVNode, Fragment, createVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import "../../../../../node_modules/vxe-table/es/components.mjs";
 /* empty css                                                   */
 import { createDataSource } from "../../utils/datasource.mjs";
@@ -719,7 +719,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const _component_el_container = ElContainer;
       return openBlock(), createBlock(_component_el_container, {
         direction: "vertical",
-        class: "fec-table",
+        class: normalizeClass(`fec-table ${__props.isSubTable ? "fec-table-sub" : ""}`),
         "data-id": localConfig.value.templateKey,
         "data-name": localConfig.value.templateName,
         "data-pkId": localConfig.value.pkId,
@@ -827,11 +827,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           ];
         }),
         _: 3
-      }, 8, ["data-id", "data-name", "data-pkId"]);
+      }, 8, ["class", "data-id", "data-name", "data-pkId"]);
     };
   }
 });
-const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a151967c"]]);
+const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1668bb1b"]]);
 export {
   _Table as default
 };

package/es/packages/vue/src/utils/formulajs/calculate.mjs

@@ -49,6 +49,8 @@ function calculate(params) {
             }
             data = JSON.stringify(data);
         }
+      } else {
+        data = JSON.stringify(data);
       }
       const actualStart = startIndex + offset;
       const actualEnd = endIndex + offset;

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

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

@@ -31,5 +31,5 @@ const _sfc_main = {
     };
   }
 };
-const H2Wrapper = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0ac00fd2"]]);
+const H2Wrapper = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2078e9ec"]]);
 exports.default = H2Wrapper;

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

@@ -23,5 +23,5 @@ const _sfc_main = {
     };
   }
 };
-const SubTitle = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-cfe3fbff"]]);
+const SubTitle = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-9a8598bc"]]);
 exports.default = SubTitle;

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

@@ -23,7 +23,7 @@ const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 const vue = require("vue");
 const common = require("../../utils/common.js");
 const OptionConfig = require("../../../components/OptionConfig.vue.js");
-const index$1 = require("../aside/index.js");
+const index = require("../aside/index.js");
 const EventConfigButton = require("../../../components/EventConfigButton.vue.js");
 const DataSourceSelect = require("../../../components/DataSourceSelect.vue.js");
 const ConditionConfigButton = ;/* empty css                                              */
@@ -32,7 +32,7 @@ const eventBus = require("../../utils/eventBus.js");
 const FieldSetMapping = require("../../../components/FieldSetMapping.vue2.js");
 const OnlyFLowConfigButton = ;/* empty css                                             */
 const FormulaEditorInput = require("../../../components/FormulaEditorInput.vue.js");
-const index$2 = require("../../../api/index.js");
+const index$1 = require("../../../api/index.js");
 ;/* empty css                                                                  */
 ;/* empty css                                                                   */
 ;/* empty css                                                                  */
@@ -56,16 +56,16 @@ require("../../table/default.js");
 ;/* empty css                                 */
 ;/* empty css                       */
 ;/* empty css                             */
-const index = require("../../../store/index.js");
+require("../../../store/index.js");
 ;/* empty css              */
-const index$3 = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
-const index$4 = require("../../../../../node_modules/element-plus/es/components/select/index.js");
-const index$5 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
-const index$6 = require("../../../../../node_modules/element-plus/es/components/input/index.js");
-const index$7 = require("../../../../../node_modules/element-plus/es/components/checkbox/index.js");
-const index$8 = require("../../../../../node_modules/element-plus/es/components/radio/index.js");
-const index$9 = require("../../../../../node_modules/element-plus/es/components/input-number/index.js");
-const index$a = require("../../../../../node_modules/element-plus/es/components/switch/index.js");
+const index$2 = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
+const index$3 = require("../../../../../node_modules/element-plus/es/components/select/index.js");
+const index$4 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
+const index$5 = require("../../../../../node_modules/element-plus/es/components/input/index.js");
+const index$6 = require("../../../../../node_modules/element-plus/es/components/checkbox/index.js");
+const index$7 = require("../../../../../node_modules/element-plus/es/components/radio/index.js");
+const index$8 = require("../../../../../node_modules/element-plus/es/components/input-number/index.js");
+const index$9 = require("../../../../../node_modules/element-plus/es/components/switch/index.js");
 const _hoisted_1 = {
   key: 0,
   class: "data-source-fields"
@@ -104,17 +104,8 @@ const _hoisted_20 = {
 const _sfc_main = {
   __name: "widgets",
   setup(__props) {
-    const currentItem = vue.computed({
-      get: () => {
-        const item = index.default.getters.selectedItem;
-        if (item) {
-          return vue.reactive({ ...index$1.defaultProperty, ...item });
-        }
-        return item;
-      },
-      set(value) {
-        index.default.commit("set_selected_item", value);
-      }
+    const currentItem = vue.computed(() => {
+      return common.getCurrentItem();
     });
     const activeName = vue.ref(["common"]);
     const validationRules = {
@@ -157,8 +148,8 @@ const _sfc_main = {
       ];
     });
     const fieldTypes = vue.computed(() => {
-      const basicComponents = index$1.default.find((c) => c.name === "basic");
-      const advancedComponents = index$1.default.find((c) => c.name === "advanced");
+      const basicComponents = index.default.find((c) => c.name === "basic");
+      const advancedComponents = index.default.find((c) => c.name === "advanced");
       return [...basicComponents == null ? void 0 : basicComponents.children, ...advancedComponents == null ? void 0 : advancedComponents.children];
     });
     function handleFieldTypeChange(fieldType) {
@@ -228,7 +219,7 @@ const _sfc_main = {
     const loadGlobalDialogs = async () => {
       dialogLoading.value = true;
       try {
-        const response = await index$2.default.getAllTemplateDialog();
+        const response = await index$1.default.getAllTemplateDialog();
         globalDialogs.value = [];
         for (let dialog of response) {
           globalDialogs.value.push({
@@ -273,7 +264,7 @@ const _sfc_main = {
           const tableId = currDialog.value.subTableId;
           if (tableId) {
             try {
-              const response = await index$2.default.getById(tableId, false);
+              const response = await index$1.default.getById(tableId, false);
               tableOptions.value = JSON.parse(response.context);
               console.log("🚀 ~ 需要获取表格配置，表格ID:", tableId);
             } catch (error) {
@@ -310,19 +301,19 @@ const _sfc_main = {
       // }
     );
     return (_ctx, _cache) => {
-      const _component_el_option = index$4.ElOption;
-      const _component_el_select = index$4.ElSelect;
-      const _component_el_input = index$6.ElInput;
-      const _component_el_form_item = index$5.ElFormItem;
-      const _component_el_checkbox = index$7.ElCheckbox;
-      const _component_el_radio_button = index$8.ElRadioButton;
-      const _component_el_radio_group = index$8.ElRadioGroup;
-      const _component_el_input_number = index$9.ElInputNumber;
-      const _component_el_switch = index$a.ElSwitch;
+      const _component_el_option = index$3.ElOption;
+      const _component_el_select = index$3.ElSelect;
+      const _component_el_input = index$5.ElInput;
+      const _component_el_form_item = index$4.ElFormItem;
+      const _component_el_checkbox = index$6.ElCheckbox;
+      const _component_el_radio_button = index$7.ElRadioButton;
+      const _component_el_radio_group = index$7.ElRadioGroup;
+      const _component_el_input_number = index$8.ElInputNumber;
+      const _component_el_switch = index$9.ElSwitch;
       const _component_ParamsConfig = ParamsConfig.default;
-      const _component_el_form = index$5.ElForm;
-      const _component_el_collapse_item = index$3.ElCollapseItem;
-      const _component_el_collapse = index$3.ElCollapse;
+      const _component_el_form = index$4.ElForm;
+      const _component_el_collapse_item = index$2.ElCollapseItem;
+      const _component_el_collapse = index$2.ElCollapse;
       return vue.openBlock(), vue.createBlock(_component_el_collapse, {
         class: "setting",
         modelValue: vue.unref(activeName),
@@ -1200,5 +1191,5 @@ const _sfc_main = {
     };
   }
 };
-const widgets = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8b0152bc"]]);
+const widgets = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-70b9496e"]]);
 exports.default = widgets;