super-page-designer 2.1.18 → 2.1.21

package/dist/es/components/design/utils/container-design-util.js

@@ -77,12 +77,15 @@ function caculateCommonStyle(configure, designStyle, designClass) {
         dimensionsStyle["flexSpan"] = tempSizeConf.flexSpan;
       }
     }
-    if (tempSizeConf.fixHeight) {
+    if (!tempSizeConf.isCalcHeight && tempSizeConf.fixHeight) {
       dimensionsStyle["height"] = tempSizeConf.fixHeight;
       if (!dimensionsStyle["height"].indexOf || dimensionsStyle["height"].indexOf("px") == -1) {
         dimensionsStyle["height"] = dimensionsStyle["height"] + "px";
       }
     }
+    if (tempSizeConf.isCalcHeight) {
+      dimensionsStyle.isCalcHeight = true;
+    }
     tempStyle[dimensions + "_style"] = dimensionsStyle;
     tempStyle[dimensions + "_class"] = dimensionsClass;
   }

package/dist/es/components/design/utils/form-design-util.js

@@ -218,21 +218,15 @@ function caculateComponentProps(configure, property) {
     if (!pageDesign.initOptionConfigs) {
       pageDesign.initOptionConfigs = [];
     }
-    let existIndex = -1;
-    for (let i = 0; i < pageDesign.initOptionConfigs.length; i++) {
-      const o = pageDesign.initOptionConfigs[i];
-      if (o.uuid == configure.uuid) {
-        existIndex = i;
-        break;
-      }
-    }
+    const existIndex = pageDesign.initOptionConfigs.findIndex((item) => item.uuid === configure.uuid);
     if (existIndex > -1) {
-      pageDesign.initOptionConfigs.shift(existIndex, 1);
+      pageDesign.initOptionConfigs.splice(existIndex, 1);
     }
     const optionConf = getComponentOptionConfigs(configure, pageDesign);
     if (optionConf) {
-      if (dataOrigin)
+      if (dataOrigin) {
         pageDesign.initOptionConfigs.push(optionConf);
+      }
       tempProps["optionconfigInfo"] = optionConf;
       if (optionConf.props && optionConf.props.monitorFields) {
         for (let fieldName of optionConf.props.monitorFields) {

package/dist/es/components/design/utils/page-table-util.js

@@ -136,7 +136,7 @@ function getListColumns(configure, pageDesign) {
       //值设置，以逗号隔开:数据库值:显示的值,数据库值:显示的值...
       valueSet: getListColumnValueSet(item),
       // 查询设置  no 不查询 normal 普通查询 advanced 高级查询
-      querySettingName: item.props.base.querySettingName,
+      querySettingName: item.props.base.querySettingName ? item.props.base.querySettingName : "no",
       // 查询时数据库的匹配方式
       queryMatching: item.props.base.queryMatching,
       // 查询框中的属性（json） width:输入框宽度 labelWidth: label宽度  label: 展示文字
@@ -171,7 +171,9 @@ function getListColumns(configure, pageDesign) {
       // 校验的类型
       checkType: getCheckType(item.props.verification.type),
       // 内容显示位置
-      contAlign: item.props.base ? item.props.base.alignContent : null
+      contAlign: item.props.base ? item.props.base.alignContent : null,
+      // 标题显示位置
+      titleAlign: item.props.base ? item.props.base.alignTittle : null
       // 国际化key，如果配置了该列则使用该列的key去查询国际化配置，如果没用配置就以“headerName”字段的值为准
       // i18nKey: string
       /**

package/dist/es/components/design/views/assemblys/common/common-attr-size.vue.js

@@ -13,6 +13,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     showMaxHeight: {
       type: Boolean,
       default: false
+    },
+    // 是否显示 计算高度 配置
+    showCalcHeight: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
@@ -46,6 +51,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
       const _component_el_input = resolveComponent("el-input");
+      const _component_el_switch = resolveComponent("el-switch");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       return openBlock(), createBlock(_component_el_collapse_item, {
         title: "尺寸",
@@ -123,6 +129,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             })) : createCommentVNode("", true),
+            __props.showCalcHeight ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 2,
+              class: "amb-design-attr-item",
+              label: "计算高度"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_switch, {
+                  modelValue: dynamicSize.value.isCalcHeight,
+                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => dynamicSize.value.isCalcHeight = $event)
+                }, null, 8, ["modelValue"])
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
             createVNode(_component_el_form_item, {
               label: "高度",
               class: "amb-design-attr-item",
@@ -130,10 +149,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, {
               default: withCtx(() => [
                 createVNode(_component_el_input, {
+                  disabled: dynamicSize.value.isCalcHeight,
                   modelValue: dynamicSize.value.fixHeight,
-                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => dynamicSize.value.fixHeight = $event),
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => dynamicSize.value.fixHeight = $event),
                   placeholder: "请输入"
-                }, null, 8, ["modelValue"])
+                }, null, 8, ["disabled", "modelValue"])
               ]),
               _: 1
             }),
@@ -144,10 +164,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, {
               default: withCtx(() => [
                 createVNode(_component_el_input, {
+                  disabled: dynamicSize.value.isCalcHeight,
                   modelValue: dynamicSize.value.maxHeight,
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => dynamicSize.value.maxHeight = $event),
+                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => dynamicSize.value.maxHeight = $event),
                   placeholder: "请输入"
-                }, null, 8, ["modelValue"])
+                }, null, 8, ["disabled", "modelValue"])
               ]),
               _: 1
             })

package/dist/es/components/design/views/assemblys/common/common-i18n-setting.vue.js

@@ -14,6 +14,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props) {
+    function closeSetting(parmas) {
+      debugger;
+    }
+    function changeI18nKey(value) {
+      debugger;
+    }
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       const _component_i18n_setting = resolveComponent("i18n-setting");
@@ -22,12 +28,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           modelValue: __props.configure.props.base.i18nKey,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.base.i18nKey = $event),
           disabled: __props.configure.props.base.prop === "$index" || __props.configure.props.base.prop === "$selection",
-          placeholder: "请输入"
+          placeholder: "请输入",
+          onChange: changeI18nKey
         }, null, 8, ["modelValue", "disabled"]),
         createVNode(_component_i18n_setting, {
           style: { "margin-left": "10px" },
           systemCode: __props.systemCode,
-          i18nkey: __props.configure.props.base.i18nKey
+          i18nkey: __props.configure.props.base.i18nKey,
+          onClose: closeSetting
         }, null, 8, ["systemCode", "i18nkey"])
       ]);
     };

package/dist/es/components/design/views/assemblys/common/common-style-background.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createElementBlock, unref } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createElementBlock, createCommentVNode, withModifiers, unref } from "vue";
 import { Plus } from "@element-plus/icons-vue";
 import { getToken } from "agilebuilder-ui/src/utils/auth";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -17,6 +17,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const token = getToken();
     const defaultShowImageAction = ref(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-form/show-image?jwt=" + token + "&serverPath=");
     console.log("uploadAction", uploadAction.value);
+    function deleteImage() {
+      props.configure.style.backgroundImageServerPath = void 0;
+    }
     function beforeAvatarUpload(file) {
       let limitFileSize = 3;
       if (file.size > limitFileSize * 1024 * 1024) {
@@ -39,6 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_el_color_picker = resolveComponent("el-color-picker");
       const _component_el_form_item = resolveComponent("el-form-item");
+      const _component_CloseBold = resolveComponent("CloseBold");
       const _component_el_icon = resolveComponent("el-icon");
       const _component_el_upload = resolveComponent("el-upload");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
@@ -74,6 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   "show-file-list": false,
                   "on-success": handleAvatarSuccess,
                   "before-upload": beforeAvatarUpload,
+                  style: { "position": "relative" },
                   name: "file"
                 }, {
                   default: withCtx(() => [
@@ -81,8 +86,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       key: 0,
                       src: defaultShowImageAction.value + __props.configure.style.backgroundImageServerPath + "&_tt=" + (/* @__PURE__ */ new Date()).getTime(),
                       class: "avatar"
-                    }, null, 8, _hoisted_2)) : (openBlock(), createBlock(_component_el_icon, {
+                    }, null, 8, _hoisted_2)) : createCommentVNode("", true),
+                    __props.configure.style.backgroundImageServerPath ? (openBlock(), createBlock(_component_el_icon, {
                       key: 1,
+                      style: { "position": "absolute", "top": "4px", "right": "4px", "font-size": "15px", "background-color": "red" },
+                      onClick: withModifiers(deleteImage, ["stop"])
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_CloseBold)
+                      ]),
+                      _: 1
+                    })) : (openBlock(), createBlock(_component_el_icon, {
+                      key: 2,
                       class: "avatar-uploader-icon"
                     }, {
                       default: withCtx(() => [

package/dist/es/components/design/views/assemblys/common/common-style-border.vue.js

@@ -13,7 +13,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_color_picker = resolveComponent("el-color-picker");
       const _component_el_form_item = resolveComponent("el-form-item");
       const _component_el_input_number = resolveComponent("el-input-number");
-      const _component_el_radio_button = resolveComponent("el-radio-button");
+      const _component_el_radio = resolveComponent("el-radio");
       const _component_el_radio_group = resolveComponent("el-radio-group");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       return openBlock(), createBlock(_component_el_collapse_item, {
@@ -60,23 +60,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.style.borderType = $event)
                 }, {
                   default: withCtx(() => [
-                    createVNode(_component_el_radio_button, { value: "solid" }, {
+                    createVNode(_component_el_radio, { value: "solid" }, {
                       default: withCtx(() => [
                         createTextVNode("实线")
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_radio_button, { value: "dotted" }, {
+                    createVNode(_component_el_radio, { value: "dotted" }, {
                       default: withCtx(() => [
                         createTextVNode("点线")
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_radio_button, { value: "dashed" }, {
+                    createVNode(_component_el_radio, { value: "dashed" }, {
                       default: withCtx(() => [
                         createTextVNode("虚线")
                       ]),
                       _: 1
+                    }),
+                    createVNode(_component_el_radio, { value: null }, {
+                      default: withCtx(() => [
+                        createTextVNode("无")
+                      ]),
+                      _: 1
                     })
                   ]),
                   _: 1

package/dist/es/components/design/views/assemblys/common/common-style-position.vue.js

@@ -51,6 +51,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     createTextVNode("sticky")
                   ]),
                   _: 1
+                }),
+                createVNode(_component_el_radio, { value: null }, {
+                  default: withCtx(() => [
+                    createTextVNode("无")
+                  ]),
+                  _: 1
                 })
               ]),
               _: 1

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,5 +1,5 @@
-import _sfc_main from "./common-variable-bind.vue3.js";
-import "./common-variable-bind.vue2.js";
+import _sfc_main from "./common-variable-bind.vue2.js";
+import "./common-variable-bind.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7fcec2fa"]]);
 export {