super-page-designer 2.0.37 → 2.0.41-beta1

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";
+import _sfc_main from "./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
 };