super-page-designer 2.0.41 → 2.0.48

package/dist/es/components/design/views/assemblys/chart/scatter/series/scatter-series-data.vue.js

@@ -4,8 +4,17 @@ const _hoisted_2 = { style: { "float": "left" } };
 const _hoisted_3 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
 const _hoisted_4 = { style: { "float": "left" } };
 const _hoisted_5 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
-const _hoisted_6 = { style: { "float": "left" } };
-const _hoisted_7 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
+const _hoisted_6 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_7 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_8 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_9 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_10 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_11 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_12 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_13 = /* @__PURE__ */ createElementVNode("br", null, null, -1);
+const _hoisted_14 = { style: { "width": "100%", "padding-left": "20px" } };
+const _hoisted_15 = { style: { "float": "left" } };
+const _hoisted_16 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "scatter-series-data",
   props: {
@@ -53,6 +62,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
       const _component_el_form_item = resolveComponent("el-form-item");
+      const _component_el_radio = resolveComponent("el-radio");
+      const _component_QuestionFilled = resolveComponent("QuestionFilled");
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_tooltip = resolveComponent("el-tooltip");
+      const _component_el_input = resolveComponent("el-input");
+      const _component_el_radio_group = resolveComponent("el-radio-group");
       const _component_el_text = resolveComponent("el-text");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       return openBlock(), createBlock(_component_el_collapse_item, {
@@ -98,51 +113,117 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }),
-            createVNode(_component_el_form_item, {
-              label: "数据字段",
-              style: { "margin-top": "-10px" }
+            createVNode(_component_el_radio_group, {
+              modelValue: __props.configure.props.yaxisSource,
+              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.yaxisSource = $event)
             }, {
               default: withCtx(() => [
-                createVNode(_component_el_select, {
-                  size: "small",
-                  modelValue: __props.configure.props.yaxisField,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.yaxisField = $event),
-                  title: __props.configure.props.yaxisField,
-                  style: { "width": "160px" },
-                  filterable: "",
-                  "allow-create": "",
-                  clearable: "",
-                  placeholder: "请选择"
+                createVNode(_component_el_form_item, { style: { "margin-top": "-10px" } }, {
+                  label: withCtx(() => [
+                    createVNode(_component_el_radio, { value: "variable" }, {
+                      default: withCtx(() => [
+                        createTextVNode("数据字段")
+                      ]),
+                      _: 1
+                    })
+                  ]),
+                  default: withCtx(() => [
+                    createVNode(_component_el_select, {
+                      size: "small",
+                      disabled: __props.configure.props.yaxisSource !== "variable",
+                      modelValue: __props.configure.props.yaxisField,
+                      "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.yaxisField = $event),
+                      title: __props.configure.props.yaxisField,
+                      style: { "width": "160px" },
+                      filterable: "",
+                      "allow-create": "",
+                      clearable: "",
+                      placeholder: "请选择"
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(true), createElementBlock(Fragment, null, renderList(sourceFields.value, (item) => {
+                          return openBlock(), createBlock(_component_el_option, {
+                            key: item.value,
+                            label: item.label,
+                            value: item.value
+                          }, {
+                            default: withCtx(() => [
+                              createElementVNode("span", _hoisted_4, toDisplayString(item.label), 1),
+                              createElementVNode("span", _hoisted_5, toDisplayString(item.type), 1)
+                            ]),
+                            _: 2
+                          }, 1032, ["label", "value"]);
+                        }), 128))
+                      ]),
+                      _: 1
+                    }, 8, ["disabled", "modelValue", "title"])
+                  ]),
+                  _: 1
+                }),
+                createVNode(_component_el_radio, {
+                  value: "formula",
+                  style: { "margin-top": "-10px" }
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(sourceFields.value, (item) => {
-                      return openBlock(), createBlock(_component_el_option, {
-                        key: item.value,
-                        label: item.label,
-                        value: item.value
-                      }, {
-                        default: withCtx(() => [
-                          createElementVNode("span", _hoisted_4, toDisplayString(item.label), 1),
-                          createElementVNode("span", _hoisted_5, toDisplayString(item.type), 1)
-                        ]),
-                        _: 2
-                      }, 1032, ["label", "value"]);
-                    }), 128))
+                    createTextVNode("计算公式  "),
+                    createVNode(_component_el_tooltip, {
+                      class: "box-item",
+                      effect: "dark",
+                      placement: "top-start"
+                    }, {
+                      content: withCtx(() => [
+                        createTextVNode("字段值: ${row.字段名}"),
+                        _hoisted_6,
+                        createTextVNode(" 最大值: ${max.字段名}"),
+                        _hoisted_7,
+                        createTextVNode("    求和: ${sum.字段名}"),
+                        _hoisted_8,
+                        createTextVNode("    均值: ${avg.字段名}"),
+                        _hoisted_9,
+                        createTextVNode(" 最小值: ${min.字段名}"),
+                        _hoisted_10,
+                        createTextVNode(" 最大值: ${max.字段名}"),
+                        _hoisted_11,
+                        createTextVNode(" 累计值: ${add.字段名}"),
+                        _hoisted_12,
+                        createTextVNode(" 其他可用变量如${page},${data},${task},${request},${context},${system}"),
+                        _hoisted_13
+                      ]),
+                      default: withCtx(() => [
+                        createVNode(_component_el_icon, { size: "16" }, {
+                          default: withCtx(() => [
+                            createVNode(_component_QuestionFilled)
+                          ]),
+                          _: 1
+                        })
+                      ]),
+                      _: 1
+                    })
                   ]),
                   _: 1
-                }, 8, ["modelValue", "title"])
+                }),
+                createElementVNode("div", _hoisted_14, [
+                  createVNode(_component_el_input, {
+                    modelValue: __props.configure.props.formula,
+                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.formula = $event),
+                    disabled: __props.configure.props.yaxisSource != "formula",
+                    rows: 4,
+                    type: "textarea",
+                    placeholder: "支持三元表达式,支持JS函数,如           return ${row.字段名}/${sum.字段名}*100"
+                  }, null, 8, ["modelValue", "disabled"])
+                ])
               ]),
               _: 1
-            }),
+            }, 8, ["modelValue"]),
             createVNode(_component_el_form_item, {
               label: "图形尺寸",
-              style: { "margin-top": "-10px", "margin-bottom": "-15px" }
+              style: { "margin-top": "10px", "margin-bottom": "-15px" }
             }, {
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   size: "small",
                   modelValue: __props.configure.props.sizeField,
-                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.sizeField = $event),
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.sizeField = $event),
                   style: { "width": "160px" },
                   filterable: "",
                   "allow-create": "",
@@ -157,8 +238,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         value: item.value
                       }, {
                         default: withCtx(() => [
-                          createElementVNode("span", _hoisted_6, toDisplayString(item.label), 1),
-                          createElementVNode("span", _hoisted_7, toDisplayString(item.type), 1)
+                          createElementVNode("span", _hoisted_15, toDisplayString(item.label), 1),
+                          createElementVNode("span", _hoisted_16, toDisplayString(item.type), 1)
                         ]),
                         _: 2
                       }, 1032, ["label", "value"]);

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() {
@@ -136,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }),
           withDirectives(createVNode(_component_el_text, { type: "success" }, {
             default: withCtx(() => [
-              createTextVNode("已设置条件.")
+              createTextVNode("  已设置条件.")
             ]),
             _: 1
           }, 512), [
@@ -274,13 +287,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 +321,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 +490,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 +500,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,5 +1,5 @@
-import _sfc_main from "./common-variable-bind.vue2.js";
-import "./common-variable-bind.vue3.js";
+import _sfc_main from "./common-variable-bind.vue3.js";
+import "./common-variable-bind.vue2.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8cdbf8c5"]]);
 export {