super-page-designer 2.0.39 → 2.0.41-beta2

package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js

@@ -14,6 +14,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     title: {
       type: String,
       default: "显示条件"
+    },
+    type: {
+      type: String,
+      required: false,
+      default: "showConditions"
     }
   },
   setup(__props) {
@@ -22,10 +27,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (!props.configure.props) {
       props.configure.props = {};
     }
-    if (!props.configure.props.showConditions) {
-      props.configure.props.showConditions = [];
+    let tableDatas = null;
+    if (props.type === "editConditions") {
+      if (!props.configure.props.editConditions) {
+        props.configure.props.editConditions = [];
+      }
+      tableDatas = props.configure.props.editConditions;
+    } else {
+      if (!props.configure.props.showConditions) {
+        props.configure.props.showConditions = [];
+      }
+      tableDatas = props.configure.props.showConditions;
     }
-    const tableDatas = props.configure.props.showConditions;
     const tableHeight = ref(300);
     const dialogTableVisible = ref(false);
     function openDialog() {
@@ -101,8 +114,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         let dataType = "";
         if (val && val.startsWith("${")) {
           let propName = val.substring(2, val.length - 1);
-          if (propName.startsWith("page."))
-            ;
+          if (propName.startsWith("page.")) ;
           else if (propName.startsWith("data.")) {
             propName = propName.substring(5);
             dataType = pageDesignUtil.getModelField(propName);
@@ -136,7 +148,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }),
           withDirectives(createVNode(_component_el_text, { type: "success" }, {
             default: withCtx(() => [
-              createTextVNode("已设置条件.")
+              createTextVNode("  已设置条件.")
             ]),
             _: 1
           }, 512), [
@@ -274,13 +286,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           label: "大于",
                           value: "GT"
                         }, null, 512), [
-                          [vShow, scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"]
+                          [
+                            vShow,
+                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
+                          ]
                         ]),
                         withDirectives(createVNode(_component_el_option, {
                           label: "小于",
                           value: "LT"
                         }, null, 512), [
-                          [vShow, scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"]
+                          [
+                            vShow,
+                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
+                          ]
                         ]),
                         withDirectives(createVNode(_component_el_option, {
                           label: "晚于",
@@ -302,13 +320,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           label: "不大于",
                           value: "LET"
                         }, null, 512), [
-                          [vShow, scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"]
+                          [
+                            vShow,
+                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
+                          ]
                         ]),
                         withDirectives(createVNode(_component_el_option, {
                           label: "不小于",
                           value: "GET"
                         }, null, 512), [
-                          [vShow, scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"]
+                          [
+                            vShow,
+                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
+                          ]
                         ]),
                         withDirectives(createVNode(_component_el_option, {
                           label: "不晚于",
@@ -465,7 +489,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx((scope) => [
                     createVNode(_component_el_icon, {
                       size: "14",
-                      style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px", "margin-left": "6px" },
+                      style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px", "margin-left": "6px" },
                       onClick: ($event) => addData(scope.row)
                     }, {
                       default: withCtx(() => [
@@ -475,7 +499,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, 1032, ["onClick"]),
                     createVNode(_component_el_icon, {
                       size: "14",
-                      style: { "color": "#5893EF", "cursor": "pointer" },
+                      style: { "color": "#5893ef", "cursor": "pointer" },
                       onClick: ($event) => deleteData(scope.row)
                     }, {
                       default: withCtx(() => [

package/dist/es/components/design/views/assemblys/common/common-advanced-basic.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode } from "vue";
+import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createCommentVNode } from "vue";
 import _sfc_main$1 from "./common-advanced-basic-showcondition.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -7,6 +7,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {
       type: Object,
       required: true
+    },
+    type: {
+      type: String,
+      required: false
+    },
+    editTitle: {
+      type: String,
+      required: false,
+      default: "可编辑条件"
     }
   },
   setup(__props) {
@@ -25,10 +34,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
-                createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"])
+                (openBlock(), createBlock(_sfc_main$1, {
+                  key: __props.configure.uuid + "_show",
+                  configure: __props.configure
+                }, null, 8, ["configure"]))
               ]),
               _: 1
-            })
+            }),
+            __props.type === "form" ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 0,
+              label: __props.editTitle,
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                (openBlock(), createBlock(_sfc_main$1, {
+                  key: __props.configure.uuid + "_edit",
+                  configure: __props.configure,
+                  type: "editConditions"
+                }, null, 8, ["configure"]))
+              ]),
+              _: 1
+            }, 8, ["label"])) : createCommentVNode("", true)
           ])
         ]),
         _: 1

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

@@ -1,7 +1,7 @@
 import _sfc_main from "./common-variable-bind.vue2.js";
-import "./common-variable-bind.vue3.js";
+/* empty css                          */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-98728067"]]);
+const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8cdbf8c5"]]);
 export {
   BindVariable as default
 };

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

@@ -4,7 +4,7 @@ import http from "agilebuilder-ui/src/utils/request";
 import { deepCopy, getUuidv4 } from "../../../utils/common-util.js";
 import { getTypeOptions, taskVarOptions, contextVarOptions } from "./common-variable-bind-option.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
-const _withScopeId = (n) => (pushScopeId("data-v-98728067"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-8cdbf8c5"), n = n(), popScopeId(), n);
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { style: { "margin-top": "10px", "font-size": "10px", "display": "flex", "align-items": "center", "justify-self": "center" } };
 const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "margin-left": "5px" } }, "输入变量名后点击加号按钮添加", -1));
@@ -63,13 +63,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const typeOptions = ref([]);
     const showInput = ref(false);
     const labelValue = ref("");
-    ref(false);
     const paramType = ref("");
     const paramValue = ref("");
     const valueOptions = ref([]);
     const selectOptions = ref({});
     const searchValue = ref("");
-    ref("");
     const popoverRef = ref(null);
     const selectInputType = ["context", "system", "task", "data", "page"];
     onMounted(() => {
@@ -114,6 +112,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     let lastTarget = null;
     function handleClickOutside(event) {
+      if (!popoverVisible.value) {
+        return;
+      }
       if (paramTypeCheck) {
         paramTypeCheck = false;
         return;
@@ -143,7 +144,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         console.log("click contains--------not");
         if (popoverVisible.value) {
-          closePopover(true);
+          closePopover();
         }
       }
     }
@@ -178,12 +179,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let popoverTimeout = null;
     function closePopover(immediate) {
       clearTimeout(popoverTimeout);
-      if (immediate) {
+      {
         popoverVisible.value = false;
-      } else {
-        popoverTimeout = setTimeout(() => {
-          popoverVisible.value = false;
-        }, 2e3);
       }
     }
     function openPopover() {
@@ -328,7 +325,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
       emits("update:modelValue", defalutValue.value, row.alias);
-      closePopover(true);
+      closePopover();
     }
     function addRequestParam(paramName) {
       paramValue.value = paramName;
@@ -341,7 +338,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
       emits("update:modelValue", defalutValue.value);
-      closePopover(true);
+      closePopover();
     }
     function addPageParams() {
       searchValue.value = searchValue.value.trim();
@@ -374,7 +371,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       defalutValue.value = "${" + paramType.value + "." + searchValue.value + "}";
       searchValue.value = "";
       emits("update:modelValue", defalutValue.value);
-      closePopover(true);
+      closePopover();
     }
     function getValueLabel(valueType, value) {
       if (selectInputType.includes(valueType)) {

package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js

@@ -70,19 +70,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         console.log("click contains--------not");
         if (popoverVisible.value) {
-          closePopover(true);
+          closePopover();
         }
       }
     }
     let popoverTimeout = null;
     function closePopover(immediate) {
       clearTimeout(popoverTimeout);
-      if (immediate) {
+      {
         popoverVisible.value = false;
-      } else {
-        popoverTimeout = setTimeout(() => {
-          popoverVisible.value = false;
-        }, 2e3);
       }
     }
     function openPopover() {
@@ -269,12 +265,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       codeType.value = "";
       thisValue.value = "";
       emits("update:modelValue", "", "", "");
-      closePopover(true);
+      closePopover();
     }
     function selectRow(row) {
       thisValue.value = row.code;
       emits("update:modelValue", codeType.value, thisValue.value, row.name, row.id);
-      closePopover(true);
+      closePopover();
     }
     function addCustom() {
       if (!inputCode.value) {
@@ -283,7 +279,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       thisValue.value = inputCode.value;
       emits("update:modelValue", codeType.value, thisValue.value, "");
-      closePopover(true);
+      closePopover();
     }
     console.log("init", props.value, props.type);
     function showPopover() {

package/dist/es/components/design/views/assemblys/common/state-button.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./state-button.vue2.js";
-import "./state-button.vue3.js";
+/* empty css                  */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const StateButton = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ae2798fb"]]);
 export {

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./barcode-attr.vue2.js";
-import "./barcode-attr.vue3.js";
+/* empty css                  */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./composite-header.vue2.js";
-import "./composite-header.vue3.js";
+/* empty css                      */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-690ad0d7"]]);
+const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b436905c"]]);
 export {
   CompositeHeader as default
 };

package/dist/es/components/design/views/assemblys/data/component/composite-header.vue2.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createElementVNode, createTextVNode, createVNode, createBlock, withCtx, createCommentVNode, toDisplayString, withDirectives, unref, vShow, Fragment, renderList } from "vue";
-import { Plus, EditPen, FolderAdd, Document, Delete } from "@element-plus/icons-vue";
+import { Plus, EditPen, Document, Delete } from "@element-plus/icons-vue";
 import { getUuidv4 } from "../../../../utils/common-util.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { getTopGroupHeaderList, setGroupHeaderDataDisplayOrder, getChildrenList, addColumnToGroupHeaders, isLeafNode } from "../../../../utils/data-table-util.js";
@@ -15,7 +15,7 @@ const _hoisted_5 = {
   class: "context-menu"
 };
 const _hoisted_6 = {
-  key: 6,
+  key: 5,
   id: "menu-4994-1-6",
   tabindex: "-1"
 };
@@ -584,27 +584,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }),
                 createTextVNode(" 修改节点 ")
               ])) : createCommentVNode("", true),
-              !selectNode.value.data.columnUuid ? (openBlock(), createElementBlock("li", {
-                key: 2,
-                id: "menu-4994-1-2",
-                class: "menu__item",
-                tabindex: "-1",
-                onClick: _cache[5] || (_cache[5] = () => operationalMenuFun("addListColumn"))
-              }, [
-                createVNode(_component_el_icon, null, {
-                  default: withCtx(() => [
-                    createVNode(unref(FolderAdd))
-                  ]),
-                  _: 1
-                }),
-                createTextVNode(" 添加字段 ")
-              ])) : createCommentVNode("", true),
               selectNode.value.data.parentUuid && !mobileOff.value ? (openBlock(), createElementBlock("li", {
-                key: 3,
+                key: 2,
                 id: "menu-4994-1-3",
                 class: "menu__item context-menuLi",
                 tabindex: "-1",
-                onClick: _cache[6] || (_cache[6] = () => operationalMenuFun("moveToRootNode"))
+                onClick: _cache[5] || (_cache[5] = () => operationalMenuFun("moveToRootNode"))
               }, [
                 createVNode(_component_el_icon, null, {
                   default: withCtx(() => [
@@ -615,11 +600,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createTextVNode(" 移至根节点 ")
               ])) : createCommentVNode("", true),
               !selectNode.value.isLeaf && !selectNode.value.isTheLeaf && !selectNode.value.data.columnUuid && !mobileOff.value ? (openBlock(), createElementBlock("li", {
-                key: 4,
+                key: 3,
                 id: "menu-4994-1-4",
                 class: "menu__item context-menuLi",
                 tabindex: "-1",
-                onClick: _cache[7] || (_cache[7] = () => operationalMenuFun("childMoveToRootNode"))
+                onClick: _cache[6] || (_cache[6] = () => operationalMenuFun("childMoveToRootNode"))
               }, [
                 createVNode(_component_el_icon, null, {
                   default: withCtx(() => [
@@ -630,11 +615,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createTextVNode(" 子节点移至根节点 ")
               ])) : createCommentVNode("", true),
               !mobileOff.value ? (openBlock(), createElementBlock("li", {
-                key: 5,
+                key: 4,
                 id: "menu-4994-1-5",
                 class: "menu__item context-menuLi",
                 tabindex: "-1",
-                onClick: _cache[8] || (_cache[8] = () => operationalMenuFun("mobileNode"))
+                onClick: _cache[7] || (_cache[7] = () => operationalMenuFun("mobileNode"))
               }, [
                 createVNode(_component_el_icon, null, {
                   default: withCtx(() => [
@@ -648,17 +633,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(_component_el_cascader, {
                   props: { value: "uuid", label: "titleText", children: "children", checkStrictly: true },
                   modelValue: cascaderValue.value,
-                  "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => cascaderValue.value = $event),
+                  "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => cascaderValue.value = $event),
                   options: fieldGroup.value,
                   onVisibleChange: cascaderChange
                 }, null, 8, ["modelValue", "options"])
               ])) : createCommentVNode("", true),
               !selectNode.value.data.columnUuid ? (openBlock(), createElementBlock("li", {
-                key: 7,
+                key: 6,
                 id: "menu-4994-1-7",
                 class: "menu__item",
                 tabindex: "-1",
-                onClick: _cache[10] || (_cache[10] = () => operationalMenuFun("deleteNode"))
+                onClick: _cache[9] || (_cache[9] = () => operationalMenuFun("deleteNode"))
               }, [
                 createVNode(_component_el_icon, null, {
                   default: withCtx(() => [
@@ -675,14 +660,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           dialogVisible.value ? (openBlock(), createBlock(_component_el_dialog, {
             key: 0,
             modelValue: dialogVisible.value,
-            "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => dialogVisible.value = $event),
+            "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => dialogVisible.value = $event),
             title: "组合表头",
             width: "500"
           }, {
             footer: withCtx(() => [
               createElementVNode("div", _hoisted_7, [
                 createVNode(_component_el_button, {
-                  onClick: _cache[13] || (_cache[13] = ($event) => dialogVisible.value = false)
+                  onClick: _cache[12] || (_cache[12] = ($event) => dialogVisible.value = false)
                 }, {
                   default: withCtx(() => [
                     createTextVNode("取消")
@@ -716,7 +701,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     default: withCtx(() => [
                       createVNode(_component_el_input, {
                         modelValue: form.value.titleText,
-                        "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => form.value.titleText = $event),
+                        "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => form.value.titleText = $event),
                         disabled: isTitleDisabled()
                       }, null, 8, ["modelValue", "disabled"])
                     ]),
@@ -726,7 +711,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     default: withCtx(() => [
                       createVNode(_component_el_input, {
                         modelValue: form.value.displayOrder,
-                        "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => form.value.displayOrder = $event),
+                        "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => form.value.displayOrder = $event),
                         modelModifiers: { number: true }
                       }, null, 8, ["modelValue"])
                     ]),
@@ -741,14 +726,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           selectColumnVisible.value ? (openBlock(), createBlock(_component_el_dialog, {
             key: 1,
             modelValue: selectColumnVisible.value,
-            "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => selectColumnVisible.value = $event),
+            "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => selectColumnVisible.value = $event),
             title: "请选择字段",
             width: "500"
           }, {
             footer: withCtx(() => [
               createElementVNode("div", _hoisted_8, [
                 createVNode(_component_el_button, {
-                  onClick: _cache[16] || (_cache[16] = ($event) => selectColumnVisible.value = false)
+                  onClick: _cache[15] || (_cache[15] = ($event) => selectColumnVisible.value = false)
                 }, {
                   default: withCtx(() => [
                     createTextVNode("取消")
@@ -769,7 +754,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(_component_el_checkbox_group, {
                 modelValue: checkList.value,
-                "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => checkList.value = $event)
+                "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => checkList.value = $event)
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_row, null, {