super-page-designer 2.1.52 → 2.1.58

package/dist/es/components/design/utils/assemblys-config.js

@@ -160,23 +160,6 @@ const tableIndexColumnConf = {
     tittleClass: ""
   }
 };
-const statisticsTableIndexColumnConf = {
-  uuid: "",
-  name: "",
-  props: {
-    base: {
-      name: "序号",
-      prop: "$index",
-      sortable: true,
-      displayOrder: 1,
-      headerAlign: "center",
-      align: "center",
-      visible: true
-    },
-    format: {}
-  },
-  style: {}
-};
 const tableSelectionColumnConf = {
   uuid: "",
   name: "",
@@ -2698,6 +2681,10 @@ const assemblyGroups = [
           size: { fixHeight: 300, widthType: "flex", flexSpan: 24 }
         },
         style: { yaxisLeft: {}, yaxisRight: {} },
+        events: [
+          { name: "beforeUpdateChart", label: "图表更新前" },
+          { name: "afterUpdateChart", label: "图表更新后", tip: "图表更新后" }
+        ],
         designComponent: defineAsyncComponent(() => {
           return import("../views/assemblys/chart/column-line/column-line-design.vue.js");
         }),
@@ -2865,7 +2852,7 @@ const assemblyGroups = [
         name: "statistical-table",
         label: "统计表格",
         icon: dataTable,
-        items: [getStatisticsTableIndexConf()],
+        items: [],
         modelFields: [],
         props: {
           base: {
@@ -3011,9 +2998,6 @@ function getTableOperateConf() {
 function getTableIndexConf() {
   return getCopyColumn(tableIndexColumnConf);
 }
-function getStatisticsTableIndexConf() {
-  return getCopyColumn(statisticsTableIndexColumnConf);
-}
 function getTableSelectionConf() {
   return getCopyColumn(tableSelectionColumnConf);
 }
@@ -3337,6 +3321,13 @@ function getComponentEventOptions(componentName) {
     }
   }
 }
+function getInputTypeComponentNames() {
+  const inputComponent = [];
+  assemblyGroups.find((item) => item.name === "form").items.forEach((item) => {
+    inputComponent.push(item.name);
+  });
+  return inputComponent;
+}
 export {
   assemblyGroups,
   getAttrComponentByName,
@@ -3346,10 +3337,10 @@ export {
   getDesignEvents,
   getFormComponentOptions,
   getInitialInformationByName,
+  getInputTypeComponentNames,
   getListComponentOptions,
   getPageConf,
   getStatisticsTableColumn,
-  getStatisticsTableIndexConf,
   getTableColumnConf,
   getTableIndexConf,
   getTableOperateConf,

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

@@ -375,7 +375,6 @@ function generateChartOption(configure, chartOption) {
     Object.assign(tempOption, customAttrJson);
   }
   chartOption.value = tempOption;
-  console.log("tempOption", tempOption);
 }
 function generateSubtitleJson(thisStyle) {
   const subtitleJson = {
@@ -463,6 +462,22 @@ function generateYaxisJson(styleYaxis, optionYaxis) {
   }
   optionYaxis.min = styleYaxis.min;
   optionYaxis.max = styleYaxis.max;
+  if (styleYaxis._dataMin === "auto") {
+    optionYaxis._dataMin = styleYaxis._dataMin;
+    optionYaxis.min = function(value) {
+      if (value.min) {
+        return Math.floor(value.min / 10) * 10;
+      }
+    };
+  }
+  if (styleYaxis._dataMax === "auto") {
+    optionYaxis._dataMax = styleYaxis._dataMax;
+    optionYaxis.max = function(value) {
+      if (value.max) {
+        return Math.ceil(value.max / 10) * 10;
+      }
+    };
+  }
   if (styleYaxis.enableAxisLine != void 0) {
     optionYaxis.splitLine.show = styleYaxis.enableAxisLine;
     if (styleYaxis.enableAxisLine) {
@@ -1598,6 +1613,7 @@ function initComponentDataConfig(configure, headerInfo) {
       } else {
         pageDesign.initChartServiceConfigs.push(config);
       }
+      config.resultSet = dataOriginInfo.resultSet ? dataOriginInfo.resultSet : null;
       return config;
     } else if (existIndex > -1) {
       pageDesign.initChartServiceConfigs.shift(existIndex, 1);

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

@@ -268,15 +268,17 @@ function getTopGroupHeaderColumnList(groupHeaders, columnItems) {
     }
   });
   eventBus.$emit("setFieldGroup", compositeHeaderFieldGroup);
-  columnItems.forEach((item) => {
-    if (item.props.base && item.props.base.prop == "$selection") {
-      topGroupHeaderList.unshift(item);
-    } else if (item.props.base && item.props.base.prop == "$index") {
-      topGroupHeaderList.splice(1, 0, item);
-    } else if (item.props.base && item.props.base.prop == "operation") {
-      topGroupHeaderList.push(item);
-    }
-  });
+  if (columnItems) {
+    columnItems.forEach((item) => {
+      if (item.props.base && item.props.base.prop == "$selection") {
+        topGroupHeaderList.unshift(item);
+      } else if (item.props.base && item.props.base.prop == "$index") {
+        topGroupHeaderList.splice(1, 0, item);
+      } else if (item.props.base && item.props.base.prop == "operation") {
+        topGroupHeaderList.push(item);
+      }
+    });
+  }
   topGroupHeaderList = topGroupHeaderList.sort((a, b) => a.displayOrder - b.displayOrder);
   return topGroupHeaderList;
 }

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

@@ -154,6 +154,11 @@ function caculateComponentProps(configure, property, titleExceedStyle) {
   if (defineProps.base && defineProps.base.titlePosition) {
     tempProps["titlePosition"] = defineProps.base.titlePosition;
   }
+  if (defineProps.base && defineProps.base.isSafeDelete) {
+    tempProps["isSafeDelete"] = true;
+  } else {
+    tempProps["isSafeDelete"] = false;
+  }
   if (defineProps.base && defineProps.base.defaultValue) {
     tempProps["defaultValue"] = defineProps.base.defaultValue;
   }

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

@@ -1,5 +1,4 @@
 function convertToExploreTreeDatas(designItems, searchItemName, cachePageItemMap, eventResult) {
-  console.log("页面大纲树的管理类----designItems=", designItems);
   const topItem = {
     uuid: "-1",
     label: "页面",

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr.vue2.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, createTextVNode, createBlock, createCommentVNode, withDirectives, createVNode, vShow } from "vue";
 import _sfc_main$1 from "./column-line-attr-base.vue.js";
 import _sfc_main$2 from "./column-line-attr-style.vue.js";
-import _sfc_main$3 from "../../common-attr-events.vue.js";
+import _sfc_main$3 from "../common/common-attr-events.vue.js";
 import _sfc_main$4 from "./attr-advanced.vue.js";
 const _hoisted_1 = { class: "amb-design-attr-content" };
 const _hoisted_2 = { class: "amb-design-attr-header" };
@@ -41,15 +41,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         createElementVNode("div", _hoisted_2, [
           createElementVNode("div", _hoisted_3, [
             createElementVNode("label", {
-              class: normalizeClass({ "selected": selAsselbyType.value == "base" }),
+              class: normalizeClass({ selected: selAsselbyType.value == "base" }),
               onClick: _cache[0] || (_cache[0] = ($event) => selAsselbyType.value = "base")
             }, "属性", 2),
             createElementVNode("label", {
-              class: normalizeClass({ "selected": selAsselbyType.value == "style" }),
+              class: normalizeClass({ selected: selAsselbyType.value == "style" }),
               onClick: _cache[1] || (_cache[1] = ($event) => selAsselbyType.value = "style")
             }, "样式", 2),
             createElementVNode("label", {
-              class: normalizeClass({ "selected": selAsselbyType.value == "event" }),
+              class: normalizeClass({ selected: selAsselbyType.value == "event" }),
               onClick: _cache[2] || (_cache[2] = ($event) => selAsselbyType.value = "event")
             }, [
               createTextVNode(" 事件 "),
@@ -59,7 +59,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["value"])) : createCommentVNode("", true)
             ], 2),
             createElementVNode("label", {
-              class: normalizeClass({ "selected": selAsselbyType.value == "advanced" }),
+              class: normalizeClass({ selected: selAsselbyType.value == "advanced" }),
               onClick: _cache[3] || (_cache[3] = ($event) => selAsselbyType.value = "advanced")
             }, "高级", 2)
           ])

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

@@ -1,7 +1,10 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode, withDirectives, vShow, createCommentVNode } from "vue";
 import _sfc_main$1 from "../../common/page-permission-select.vue.js";
 import { usePageContextStore } from "../../../../../../stores/page-store.js";
-import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
+import { queryServiceReturnFields, queryServiceInfo } from "../../../../utils/page-service-util.js";
+import BindVariable from "../../common/common-variable-bind.vue.js";
+import { getUuidv4 } from "../../../../utils/common-util.js";
+import { ElMessageBox, ElMessage } from "element-plus";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "float": "left" } };
 const _hoisted_3 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
@@ -113,6 +116,49 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.configure.serviceDataField = null;
       }
     }
+    function fieldsDefaultValue(modelValue) {
+      props.configure.props.dataOrigin.resultSet = modelValue;
+      if (props.configure.serviceDataField && modelValue.startsWith("${page.")) {
+        queryServiceInfo(dataOriginInfo.service.simpleCode).then((result) => {
+          var _a;
+          const returnValues = result.returnValues ? JSON.parse(result.returnValues) : [];
+          const serviceDataSource = returnValues.find((item) => item.name == props.configure.serviceDataField);
+          if (serviceDataSource && serviceDataSource.type == "array") {
+            if (((_a = serviceDataSource.items[0]) == null ? void 0 : _a.type) == "object") {
+              ElMessageBox.confirm("是否需要将服务变量中的对象数组中的属性设值要页面变量中?", "提示", {
+                confirmButtonText: "添加",
+                cancelButtonText: "取消",
+                type: "info"
+              }).then(() => {
+                setServiceVarToPageVar(modelValue, serviceDataSource);
+              }).catch(() => {
+                console.log("取消");
+              });
+            }
+          }
+        });
+      }
+    }
+    function setServiceVarToPageVar(modelValue, serviceFieldsSource) {
+      var _a;
+      const pageVarName = modelValue.replace("${page.", "").replace("}", "");
+      const pageVarNameIndex = pageDesign.variables.findIndex((pv) => pv.name == pageVarName);
+      const pageVar = pageDesign.variables[pageVarNameIndex];
+      if (pageVar && pageVar.type == "array" && ((_a = pageVar.items[0]) == null ? void 0 : _a.type) == "object") {
+        serviceFieldsSource.items[0].items.forEach((serviceField) => {
+          const pageVarFieldIndex = pageVar.items[0].items.findIndex((pvf) => pvf.name == serviceField.name);
+          if (pageVarFieldIndex == -1) {
+            pageVar.items[0].items.push({
+              name: serviceField.name,
+              type: serviceField.type,
+              alias: serviceField.alias,
+              code: getUuidv4()
+            });
+          }
+        });
+        ElMessage.success("添加成功");
+      }
+    }
     setTimeout(() => {
       getServiceReturnFields(dataOriginInfo.service.id);
     }, 10);
@@ -191,6 +237,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }),
+            createVNode(_component_el_form_item, {
+              label: "结果设值到",
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                (openBlock(), createBlock(BindVariable, {
+                  key: __props.configure.uuid,
+                  modelValue: __props.configure.props.dataOrigin.resultSet,
+                  "onUpdate:modelValue": fieldsDefaultValue
+                }, null, 8, ["modelValue"]))
+              ]),
+              _: 1
+            }),
             createVNode(_component_el_form_item, {
               label: "立即查询",
               class: "amb-design-attr-item"

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

@@ -0,0 +1,22 @@
+import { defineComponent, openBlock, createBlock } from "vue";
+import AttrEvent from "../../form/common/attr-event.vue.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "common-attr-events",
+  props: {
+    configure: {
+      type: Object,
+      required: true
+    }
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(AttrEvent, {
+        configure: __props.configure,
+        events: __props.configure.events
+      }, null, 8, ["configure", "events"]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/design/views/assemblys/chart/common/common-attr-events.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./common-attr-events.vue.js";
+export {
+  _sfc_main as default
+};

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

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, withDirectives, createTextVNode, vShow, createElementBlock, Fragment, renderList } from "vue";
+import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, createCommentVNode, withDirectives, vShow, createElementBlock, Fragment, renderList } from "vue";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "common-style-yaxis",
@@ -11,17 +11,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     name: Object
   },
   setup(__props) {
+    const props = __props;
     const fontSizes = ["8", "10", "12", "14", "16", "18", "20", "24", "28"];
     const nameLocations = ["start", "middle", "center", "end"];
+    function yaxisMinMaxChange() {
+      if (props.yaxis._dataMin !== "fixed") {
+        delete props.yaxis.min;
+      }
+      if (props.yaxis._dataMax !== "fixed") {
+        delete props.yaxis.min;
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       const _component_el_form_item = resolveComponent("el-form-item");
+      const _component_el_radio = resolveComponent("el-radio");
+      const _component_el_radio_group = resolveComponent("el-radio-group");
       const _component_el_input_number = resolveComponent("el-input-number");
       const _component_el_divider = resolveComponent("el-divider");
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
       const _component_el_radio_button = resolveComponent("el-radio-button");
-      const _component_el_radio_group = resolveComponent("el-radio-group");
       const _component_el_color_picker = resolveComponent("el-color-picker");
       const _component_el_text = resolveComponent("el-text");
       const _component_el_switch = resolveComponent("el-switch");
@@ -47,28 +57,84 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               _: 1
             }),
             createVNode(_component_el_form_item, {
-              label: "最小值",
+              label: "最小值设置",
               style: { "margin-top": "-10px" }
             }, {
               default: withCtx(() => [
-                createVNode(_component_el_input_number, {
+                createVNode(_component_el_radio_group, {
+                  modelValue: __props.yaxis._dataMin,
+                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.yaxis._dataMin = $event),
+                  onChange: yaxisMinMaxChange
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_radio, { value: "default" }, {
+                      default: withCtx(() => [
+                        createTextVNode("默认")
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_radio, { value: "fixed" }, {
+                      default: withCtx(() => [
+                        createTextVNode("固定值")
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_radio, { value: "auto" }, {
+                      default: withCtx(() => [
+                        createTextVNode("自动计算")
+                      ]),
+                      _: 1
+                    })
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"]),
+                __props.yaxis._dataMin === "fixed" ? (openBlock(), createBlock(_component_el_input_number, {
+                  key: 0,
                   modelValue: __props.yaxis.min,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.yaxis.min = $event),
+                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.yaxis.min = $event),
                   max: __props.yaxis.max
-                }, null, 8, ["modelValue", "max"])
+                }, null, 8, ["modelValue", "max"])) : createCommentVNode("", true)
               ]),
               _: 1
             }),
             createVNode(_component_el_form_item, {
-              label: "最大值",
-              style: { "margin-top": "-10px" }
+              label: "最大值设置",
+              style: { "margin-top": "-10px" },
+              onChange: yaxisMinMaxChange
             }, {
               default: withCtx(() => [
-                createVNode(_component_el_input_number, {
+                createVNode(_component_el_radio_group, {
+                  modelValue: __props.yaxis._dataMax,
+                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.yaxis._dataMax = $event)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_radio, { value: "default" }, {
+                      default: withCtx(() => [
+                        createTextVNode("默认")
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_radio, { value: "fixed" }, {
+                      default: withCtx(() => [
+                        createTextVNode("固定值")
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_radio, { value: "auto" }, {
+                      default: withCtx(() => [
+                        createTextVNode("自动计算")
+                      ]),
+                      _: 1
+                    })
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"]),
+                __props.yaxis._dataMax === "fixed" ? (openBlock(), createBlock(_component_el_input_number, {
+                  key: 0,
                   modelValue: __props.yaxis.max,
-                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.yaxis.max = $event),
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.yaxis.max = $event),
                   min: __props.yaxis.min
-                }, null, 8, ["modelValue", "min"])
+                }, null, 8, ["modelValue", "min"])) : createCommentVNode("", true)
               ]),
               _: 1
             }),
@@ -79,7 +145,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_input_number, {
                   modelValue: __props.yaxis.offset,
-                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.yaxis.offset = $event),
+                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.yaxis.offset = $event),
                   min: 0,
                   max: "180"
                 }, null, 8, ["modelValue"])
@@ -101,7 +167,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.yaxis.nameLocation,
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.yaxis.nameLocation = $event),
+                  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.yaxis.nameLocation = $event),
                   placeholder: "默认",
                   clearable: ""
                 }, {
@@ -127,7 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_radio_group, {
                   modelValue: __props.yaxis.nameAlign,
-                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.yaxis.nameAlign = $event)
+                  "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.yaxis.nameAlign = $event)
                 }, {
                   default: withCtx(() => [
                     createVNode(_component_el_radio_button, { value: "right" }, {
@@ -154,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(_component_el_radio_group, {
                   style: { "margin-top": "10px" },
                   modelValue: __props.yaxis.nameVerticalAlign,
-                  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.yaxis.nameVerticalAlign = $event)
+                  "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.yaxis.nameVerticalAlign = $event)
                 }, {
                   default: withCtx(() => [
                     createVNode(_component_el_radio_button, { value: "bottom" }, {
@@ -190,7 +256,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_input_number, {
                   modelValue: __props.yaxis.namePadding,
-                  "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.yaxis.namePadding = $event),
+                  "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.yaxis.namePadding = $event),
                   min: "0",
                   max: "200"
                 }, null, 8, ["modelValue"])
@@ -206,7 +272,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_color_picker, {
                   modelValue: __props.yaxis.nameColor,
-                  "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.yaxis.nameColor = $event)
+                  "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.yaxis.nameColor = $event)
                 }, null, 8, ["modelValue"])
               ]),
               _: 1
@@ -220,7 +286,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.yaxis.nameFontSize,
-                  "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.yaxis.nameFontSize = $event),
+                  "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.yaxis.nameFontSize = $event),
                   placeholder: "默认",
                   clearable: ""
                 }, {
@@ -252,7 +318,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_input, {
                   modelValue: __props.yaxis.formatter,
-                  "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.yaxis.formatter = $event),
+                  "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.yaxis.formatter = $event),
                   rows: 2,
                   type: "textarea",
                   placeholder: ""
@@ -276,7 +342,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_color_picker, {
                   modelValue: __props.yaxis.labelColor,
-                  "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.yaxis.labelColor = $event)
+                  "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.yaxis.labelColor = $event)
                 }, null, 8, ["modelValue"])
               ]),
               _: 1
@@ -288,7 +354,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.yaxis.labelFontSize,
-                  "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.yaxis.labelFontSize = $event),
+                  "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.yaxis.labelFontSize = $event),
                   placeholder: "默认",
                   clearable: ""
                 }, {
@@ -312,7 +378,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_switch, {
                   modelValue: __props.yaxis.enableAxisLine,
-                  "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.yaxis.enableAxisLine = $event)
+                  "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => __props.yaxis.enableAxisLine = $event)
                 }, null, 8, ["modelValue"])
               ]),
               _: 1
@@ -324,7 +390,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_input_number, {
                   modelValue: __props.yaxis.splitNumber,
-                  "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.yaxis.splitNumber = $event),
+                  "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => __props.yaxis.splitNumber = $event),
                   min: "0",
                   max: "100"
                 }, null, 8, ["modelValue"])

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./data-origin.vue2.js";
 import "./data-origin.vue3.js";
 import _export_sfc from "../../../../../../../_virtual/_plugin-vue_export-helper.js";
-const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c2babae7"]]);
+const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a62867e0"]]);
 export {
   DataOrigin as default
 };

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/data-origin.vue2.js

@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       default: () => []
     }
   },
-  emits: ["serviceFieldChange"],
+  emits: ["serviceFieldChange", "bindVariableChange"],
   setup(__props, { emit: __emit }) {
     const emit = __emit;
     const props = __props;
@@ -62,6 +62,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     if (props.configure.props.dataOrigin.dataSource === "service") {
       getServiceReturnFields();
+    } else if (props.configure.props.dataOrigin.dataSource === "variable") {
+      emit("bindVariableChange", dataOriginInfo.variable);
     }
     const serviceFields = ref([]);
     const showFields = computed(() => {
@@ -101,6 +103,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     }
+    function dataSourceChange() {
+      if (dataOriginInfo.dataSource === "variable") {
+        emit("serviceFieldChange", []);
+      }
+    }
     function addSortField() {
       props.configure.props.dataOrigin.columnToRow.transColumns.push({});
       atPresentSortIndex.value = "";
@@ -110,6 +117,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function afterBindDefaultValue(modelValue) {
       props.configure.props.dataOrigin.variable = modelValue;
+      emit("bindVariableChange", modelValue);
     }
     function fieldsDefaultValue(modelValue) {
       props.configure.props.dataOrigin.fields = modelValue;
@@ -151,7 +159,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 default: withCtx(() => [
                   createVNode(_component_el_radio_group, {
                     modelValue: __props.configure.props.dataOrigin.dataSource,
-                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.dataOrigin.dataSource = $event)
+                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.dataOrigin.dataSource = $event),
+                    onChange: dataSourceChange
                   }, {
                     default: withCtx(() => [
                       createVNode(_component_el_radio, { value: "variable" }, {
@@ -408,8 +417,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 default: withCtx(() => [
                   createVNode(_component_el_table_column, {
                     "header-align": "center",
-                    align: "center",
-                    width: "60"
+                    align: "center"
                   }, {
                     default: withCtx((scope) => [
                       createVNode(_component_el_icon, {
@@ -665,7 +673,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              __props.configure.props.dataOrigin.transition === "columnToRow" ? (openBlock(), createBlock(_component_el_form_item, {
+              __props.configure.props.dataOrigin.dataSource === "service" ? (openBlock(), createBlock(_component_el_form_item, {
                 key: 9,
                 label: "设置到变量",
                 class: "amb-design-attr-item"

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/style-table.vue.js

@@ -41,7 +41,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const tableData = ref([]);
-    if (props.data) {
+    if (props.data && Array.isArray(props.data)) {
       tableData.value = props.data;
     }
     if (!tableData.value || tableData.value.length == 0) {