super-page-designer 2.1.49 → 2.1.52

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

@@ -170,13 +170,10 @@ const statisticsTableIndexColumnConf = {
       sortable: true,
       displayOrder: 1,
       headerAlign: "center",
-      align: "center"
+      align: "center",
+      visible: true
     },
-    format: {},
-    size: {},
-    dataOrigin: {
-      sortField: [{ name: "", type: "" }]
-    }
+    format: {}
   },
   style: {}
 };
@@ -313,14 +310,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 +1290,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 +1329,7 @@ const assemblyGroups = [
             selection: true,
             showIndex: true,
             showOperation: true,
-            stripe: true,
+            stripe: false,
             highlightCurrentRow: true,
             subPaging: true
           },
@@ -2876,7 +2873,7 @@ const assemblyGroups = [
             align: "left",
             fixed: false,
             showIndex: true,
-            stripe: true,
+            stripe: false,
             sortable: false
           },
           size: {},
@@ -2893,7 +2890,6 @@ const assemblyGroups = [
         style: {
           titleFont: {},
           tableHeader: {},
-          rowStyle: [{ type: "", model: "" }],
           background: {},
           margin: {},
           padding: {},

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 = [];
@@ -306,9 +300,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 +324,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/common/common-attr-data.vue.js

@@ -90,7 +90,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();

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) => [

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

@@ -1 +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"]]);
+export {
+  DataOrigin as default
+};