super-page-designer 2.1.49 → 2.1.55

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

@@ -160,26 +160,6 @@ const tableIndexColumnConf = {
     tittleClass: ""
   }
 };
-const statisticsTableIndexColumnConf = {
-  uuid: "",
-  name: "",
-  props: {
-    base: {
-      name: "序号",
-      prop: "$index",
-      sortable: true,
-      displayOrder: 1,
-      headerAlign: "center",
-      align: "center"
-    },
-    format: {},
-    size: {},
-    dataOrigin: {
-      sortField: [{ name: "", type: "" }]
-    }
-  },
-  style: {}
-};
 const tableSelectionColumnConf = {
   uuid: "",
   name: "",
@@ -313,14 +293,15 @@ function getStatisticsTableColumn(fieldInfo) {
         sortable: true,
         headerAlign: "center",
         align: "center",
-        fixed: false
+        fixed: false,
+        visible: true
       },
       dataOrigin: {
         sortField: [{ name: "", type: "" }]
       },
       format: {}
     },
-    style: {}
+    style: []
   };
   return getCopyColumn(columnConf);
 }
@@ -1292,8 +1273,7 @@ const assemblyGroups = [
           { name: "row-dblclick", label: "行双击", tip: "当某一行被双击时会触发该事件" },
           { name: "header-click", label: "列表头点击", tip: "当某一列的表头被点击时会触发该事件" },
           { name: "show", label: "列表显示", tip: "列表显示回调方法" },
-          { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" },
-          { name: "row-style", label: "行style", tip: "行style的回调方法" }
+          { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
         ],
         icon: dataTable,
         btnList: [
@@ -1332,7 +1312,7 @@ const assemblyGroups = [
             selection: true,
             showIndex: true,
             showOperation: true,
-            stripe: true,
+            stripe: false,
             highlightCurrentRow: true,
             subPaging: true
           },
@@ -2701,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");
         }),
@@ -2868,7 +2852,7 @@ const assemblyGroups = [
         name: "statistical-table",
         label: "统计表格",
         icon: dataTable,
-        items: [getStatisticsTableIndexConf()],
+        items: [],
         modelFields: [],
         props: {
           base: {
@@ -2876,7 +2860,7 @@ const assemblyGroups = [
             align: "left",
             fixed: false,
             showIndex: true,
-            stripe: true,
+            stripe: false,
             sortable: false
           },
           size: {},
@@ -2893,7 +2877,6 @@ const assemblyGroups = [
         style: {
           titleFont: {},
           tableHeader: {},
-          rowStyle: [{ type: "", model: "" }],
           background: {},
           margin: {},
           padding: {},
@@ -3015,9 +2998,6 @@ function getTableOperateConf() {
 function getTableIndexConf() {
   return getCopyColumn(tableIndexColumnConf);
 }
-function getStatisticsTableIndexConf() {
-  return getCopyColumn(statisticsTableIndexColumnConf);
-}
 function getTableSelectionConf() {
   return getCopyColumn(tableSelectionColumnConf);
 }
@@ -3341,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,
@@ -3350,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

@@ -463,6 +463,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 +1614,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

@@ -13,9 +13,7 @@ function formatConditionList(conditionList, attributeMap, fieldMap) {
     for (var i = 0; i < conditionList.length; i++) {
       const item = conditionList[i];
       if (item && item.propDbName && attributeMap) {
-        const operatorsArr = getOperators(
-          fieldMap[item.propDbName]
-        );
+        const operatorsArr = getOperators(fieldMap[item.propDbName]);
         if (operatorsArr && operatorsArr.length > 0) {
           const operator = operatorsArr.filter((operItem) => {
             return operItem.name === item.operator;
@@ -192,6 +190,7 @@ function addColumnToGroupHeaders(column, parentUuid, groupHeaders) {
     uuid: getUuidv4(),
     parentUuid,
     columnUuid: column.uuid,
+    prop: column.props.base.prop,
     titleText: column.props.base.name,
     isLeaf: true
   };
@@ -234,23 +233,18 @@ function getTopGroupHeaderList(groupHeaders) {
   return topGroupHeaderList;
 }
 function isLeafNode(headerCol, groupHeaders) {
-  const childrenList = groupHeaders.filter((item) => item.parentUuid === headerCol.uuid);
-  if (childrenList && childrenList.length > 0) {
-    return false;
+  for (const item of groupHeaders) {
+    if (item.parentUuid === headerCol.uuid) {
+      return false;
+    }
+    if (item.children && item.children.length > 0) {
+      if (!isLeafNode(headerCol, item.children)) {
+        return false;
+      }
+    }
   }
   return true;
 }
-function getChildrenList(parentUuid, groupHeaders) {
-  let childrenList = [];
-  groupHeaders.forEach((item) => {
-    if (item.parentUuid === parentUuid) {
-      item.isLeaf = isLeafNode(item, groupHeaders);
-      childrenList.push(item);
-    }
-  });
-  childrenList = childrenList.sort((a, b) => a.displayOrder - b.displayOrder);
-  return childrenList;
-}
 function getTopGroupHeaderColumnList(groupHeaders, columnItems) {
   console.log("组合表头---groupHeaders=====", groupHeaders);
   let topGroupHeaderList = [];
@@ -274,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;
 }
@@ -306,9 +302,12 @@ function getAllChildrenList(parentItem, groupHeaders, columnItems) {
   }
 }
 function getColumnsWithGroupHeader(tableConfigure) {
+  if (!tableConfigure.props.groupHeaders) {
+    return;
+  }
   let columns = [];
   let tableColumns = tableConfigure.items;
-  let groupHeaders = tableConfigure.props.groupHeaders;
+  let groupHeaders = JSON.parse(JSON.stringify(tableConfigure.props.groupHeaders));
   if (tableColumns && (!groupHeaders || groupHeaders.length === 0)) {
     columns = tableColumns.sort((a, b) => {
       if (a.props.base) {
@@ -327,7 +326,6 @@ export {
   addColumnToGroupHeaders,
   deleteGroupHeaderByColumnUuid,
   formatConditionList,
-  getChildrenList,
   getColumnsWithGroupHeader,
   getOperators,
   getTopGroupHeaderList,

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

@@ -356,7 +356,6 @@ function watchValidate(configure, verification, fieldInfo) {
   const prop = configure.props.base.prop;
   if (prop) {
     if (verification) {
-      debugger;
       if (verification.required) {
         watchRequiredValidate(configure, fieldInfo);
       }

package/dist/es/components/design/utils/page-service-util.d.ts

@@ -5,11 +5,11 @@
  * @param tableName
  * @returns
  */
-export declare function queryServiceInfo(serivceId: number): Promise<any>;
+export declare function queryServiceInfo(serviceCode: string): Promise<any>;
 /**
  * 查询服务的返回字段信息
  * @param serviceInfo
  * @returns
  */
-export declare function queryServiceReturnFields(serivceId: number): Promise<any>;
+export declare function queryServiceReturnFields(serviceCode: string): Promise<any>;
 export declare function fetchPageDesignData(pageId: number): any;

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

@@ -1,11 +1,11 @@
 import http from "agilebuilder-ui/src/utils/request";
-function queryServiceInfo(serivceId) {
-  let url = window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/service-flow/" + serivceId;
+function queryServiceInfo(serviceCode) {
+  let url = window["$vueApp"].config.globalProperties.baseAPI + "/api/super-page-design/service-flow/" + serviceCode;
   return http.get(url);
 }
-function queryServiceReturnFields(serivceId) {
+function queryServiceReturnFields(serviceCode) {
   return new Promise((resolve, reject) => {
-    queryServiceInfo(serivceId).then((result) => {
+    queryServiceInfo(serviceCode).then((result) => {
       console.log("queryServiceReturnFields", result);
       const returnValues = result.returnValues ? JSON.parse(result.returnValues) : [];
       const fieldInfos = [];
@@ -23,6 +23,7 @@ function convertReturnValuesToFields(parentFieldName, returnValues, fieldInfos)
   }
   for (let r of returnValues) {
     let fieldName = null;
+    let label = null;
     if (!r.isArrayElement) {
       fieldName = r.name;
       if (!fieldName && r.value) {
@@ -34,10 +35,11 @@ function convertReturnValuesToFields(parentFieldName, returnValues, fieldInfos)
       }
       if (parentFieldName) {
         fieldName = parentFieldName + "." + fieldName;
+        label = parentFieldName + "." + r.alias;
       }
       const fieldInfo = {
         value: fieldName,
-        label: fieldName,
+        label: label || fieldName,
         type: r.type
       };
       fieldInfos.push(fieldInfo);

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

@@ -202,7 +202,7 @@ function getGroupHeaders(configure) {
         displayOrder: item.displayOrder,
         uuid: item.uuid
       };
-      if (item.props.base && item.props.base.prop) {
+      if (item.props && item.props.base && item.props.base.prop) {
         header.prop = getNameFromProp(item.props.base.prop);
       }
       result.push(header);
@@ -398,7 +398,8 @@ function getFileSet(item) {
   return null;
 }
 function getControlConfig(item) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  let controlConfig;
   if (item.name === "select" && item.props.base.multiple) {
     const baseProps = item.props.base;
     const allowCreate = baseProps.allowCreate;
@@ -407,21 +408,33 @@ function getControlConfig(item) {
     if (item.props.dataOrigin.filterType === "normal") {
       filterable = true;
     }
-    return JSON.stringify({
+    controlConfig = {
       automaticDropdown: false,
       clearable,
       filterable,
       allowCreate
-    });
+    };
   } else if (item.name === "input-text") {
     const scanEnable = ((_a = item.props.scan) == null ? void 0 : _a.enable) ? true : false;
     const scanRuleList = (_b = item.props.scan) == null ? void 0 : _b.ruleList;
-    return JSON.stringify({
+    controlConfig = {
       scanEnable,
       scanRuleList
-    });
+    };
   }
-  return null;
+  if ((_c = item.style) == null ? void 0 : _c.cellStyle) {
+    if (!controlConfig) {
+      controlConfig = {};
+    }
+    controlConfig["cellStyle"] = item.style.cellStyle;
+  }
+  if ((_d = item.style) == null ? void 0 : _d.titleStyle) {
+    if (!controlConfig) {
+      controlConfig = {};
+    }
+    controlConfig["titleStyle"] = item.style.titleStyle;
+  }
+  return controlConfig ? JSON.stringify(controlConfig) : null;
 }
 function getPropsFormat(item) {
   var _a, _b;
@@ -432,8 +445,17 @@ function getPropsFormat(item) {
       const format = {};
       format.type = item.props.format.type;
       const jumpJson = JSON.parse(JSON.stringify(item.props.linkPage));
-      if (jumpJson.displayTextJudge && jumpJson.dynamicTags && jumpJson.dynamicTags.length > 0) {
-        jumpJson.displayText = jumpJson.dynamicTags.join("-#-#");
+      if (jumpJson && Array.isArray(jumpJson)) {
+        format.multPage = true;
+        jumpJson.forEach((item2) => {
+          if (item2.jumpPageSetting.displayTextJudge && item2.jumpPageSetting.dynamicTags && item2.jumpPageSetting.dynamicTags.length > 0) {
+            item2.jumpPageSetting.displayText = item2.jumpPageSetting.dynamicTags.join("-#-#");
+          }
+        });
+      } else {
+        if (jumpJson.displayTextJudge && jumpJson.dynamicTags && jumpJson.dynamicTags.length > 0) {
+          jumpJson.displayText = jumpJson.dynamicTags.join("-#-#");
+        }
       }
       format.jumpPageJson = JSON.stringify(jumpJson);
       return JSON.stringify(format);
@@ -547,7 +569,8 @@ function getModelOptionsByFields(dataFieldList) {
         value: element.dbColumnName,
         // element.name
         label: element.alias,
-        alias: element.alias
+        alias: element.alias,
+        dataType: element.dataType
       });
     });
   }

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" } };
@@ -90,7 +93,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.configure.serviceDataField = null;
         return;
       }
-      queryServiceReturnFields(serviceId).then((fields) => {
+      queryServiceReturnFields(dataOriginInfo.service.simpleCode).then((fields) => {
         props.configure.serviceFields = fields;
         serviceFields.value = fields;
         checkDataFieldExist();
@@ -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-attr-groupby.vue.js

@@ -178,7 +178,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }),
                 createVNode(_component_el_table_column, {
                   prop: "label",
-                  label: "维度名称",
+                  label: "维度字段",
                   width: "90"
                 }, {
                   default: withCtx((scope) => [