super-page-designer 2.1.34 → 2.1.41-tmp1

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

@@ -116,6 +116,7 @@ const tableIndexColumnConf = {
       alignTittle: "center",
       alignContent: "center"
     },
+    format: {},
     size: {},
     editLine: {},
     scan: {},
@@ -280,6 +281,29 @@ function getTableColumnConf(fieldInfo) {
   };
   return getCopyColumn(columnConf);
 }
+function getStatisticsTableColumn(fieldInfo) {
+  const columnConf = {
+    uuid: "",
+    name: "",
+    props: {
+      base: {
+        prop: fieldInfo ? fieldInfo.dbColumnName : "",
+        name: fieldInfo ? fieldInfo.alias : "",
+        displayOrder: fieldInfo ? fieldInfo.displayOrder : 1,
+        sortable: true,
+        alignTittle: "center",
+        alignContent: "center",
+        listColumnFixed: "false"
+      },
+      dataOrigin: {
+        sortField: [{ name: "", type: "" }]
+      },
+      format: { type: "", icon: "", suffixModule: { staticStates: [] }, jumpPageAdditional: { staticStates: [] } }
+    },
+    style: {}
+  };
+  return getCopyColumn(columnConf);
+}
 const assemblyGroups = [
   {
     name: "container",
@@ -1117,7 +1141,7 @@ const assemblyGroups = [
         props: {
           base: {
             tittleShow: true,
-            title: "标签"
+            title: "Label组件"
           },
           size: {
             pc: {
@@ -2819,6 +2843,47 @@ const assemblyGroups = [
         attrComponent: defineAsyncComponent(() => {
           return import("../views/assemblys/chart/scatter/scatter-attr.vue.js");
         })
+      },
+      {
+        name: "statistical-table",
+        label: "统计表格",
+        icon: dataTable,
+        items: [getTableIndexConf()],
+        modelFields: [],
+        props: {
+          base: {
+            alignTittle: "left",
+            alignContent: "left",
+            showIndex: true,
+            stripe: true
+          },
+          size: {},
+          highOrder: {},
+          otherSettings: {},
+          dataOrigin: {
+            optionValueSetType: "",
+            sortField: [{ name: "", type: "" }]
+          },
+          isChangeGroupHeader: false,
+          groupHeaders: []
+          // 组合表头配置
+        },
+        style: {
+          titleFont: {},
+          tableHeader: {},
+          rowStyle: [{ type: "", model: "" }],
+          background: {},
+          margin: {},
+          padding: {},
+          border: {},
+          shadow: {}
+        },
+        designComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/statistical-table/statisticalTable-design.vue.js");
+        }),
+        attrComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/statistical-table/statisticalTable-attr.vue.js");
+        })
       }
     ]
   },
@@ -3085,8 +3150,12 @@ const standardButtonOperations = [
         value: "export"
       },
       {
-        label: "查询",
+        label: "刷新列表",
         value: "search"
+      },
+      {
+        label: "显示查询区域",
+        value: "showSearch"
       }
     ]
   },
@@ -3252,6 +3321,7 @@ export {
   getFormComponentOptions,
   getInitialInformationByName,
   getPageConf,
+  getStatisticsTableColumn,
   getTableColumnConf,
   getTableIndexConf,
   getTableOperateConf,

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

@@ -1,3 +1,4 @@
+import { getToken } from "agilebuilder-ui/src/utils/auth";
 function caculatePageStyle(configure, designStyle, designClass) {
   const tempStyle = {};
   let tempClass = "";
@@ -26,6 +27,9 @@ function caculatePageStyle(configure, designStyle, designClass) {
   if (defineStyle.backgroundColor) {
     tempStyle["background-color"] = defineStyle.backgroundColor;
   }
+  if (defineStyle.backgroundImageServerPath) {
+    tempStyle["background-image"] = "url(" + window["$vueApp"].config.globalProperties.baseAPI + "/component/super-form/show-image?jwt=" + getToken() + "&serverPath=" + defineStyle.backgroundImageServerPath + ")";
+  }
   if (defineStyle.paddingTop) {
     tempStyle["padding-top"] = defineStyle.paddingTop + "px";
   }

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

@@ -13,7 +13,7 @@ export declare function caculateDetailComponentStyle(configure: any, designStyle
  * @param {*}
  * @return {*}
  */
-export declare function caculateComponentProps(configure: any, property: any): void;
+export declare function caculateComponentProps(configure: any, property: any, titleExceedStyle?: any): void;
 /**
  * 移除组件的数据源对象
  * @param configure

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

@@ -111,7 +111,7 @@ function caculateDetailComponentStyle(configure, designStyle, designClass, desig
     designHeaderStyle.value = tempHeaderStyle;
   }
 }
-function caculateComponentProps(configure, property) {
+function caculateComponentProps(configure, property, titleExceedStyle) {
   const tempProps = {};
   let defineProps = {};
   if (configure.default && configure.default.props) {
@@ -137,6 +137,15 @@ function caculateComponentProps(configure, property) {
   if (defineProps.base && defineProps.base.titleWidth) {
     tempProps["labelWidth"] = defineProps.base.titleWidth + "px";
   }
+  if (defineProps.base && defineProps.base.titleShowWay === "block") {
+    titleExceedStyle.value = {};
+  }
+  if (defineProps.base && defineProps.base.titleShowWay === "inline") {
+    titleExceedStyle.value = { "overflow": "hidden", "white-space": "nowrap" };
+  }
+  if (defineProps.base && defineProps.base.titleShowWay === "omit") {
+    titleExceedStyle.value = { "overflow": "hidden", "white-space": "nowrap", "text-overflow": "ellipsis" };
+  }
   if (defineProps.base && defineProps.base.tittleShow) {
     tempProps["tittleShow"] = true;
   } else {

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

@@ -6,13 +6,17 @@ function getCustomFuncs() {
     return options;
   }
   const customEvents = pageDesign.customEvents;
-  for (let e of customEvents) {
-    if (e.name == "customFunc") {
-      options.push({
-        value: e.eventName,
-        label: e.eventName + (e.remark ? "-" + e.remark : "")
-      });
+  try {
+    for (let e of customEvents) {
+      if (e.name == "customFunc") {
+        options.push({
+          value: e.eventName,
+          label: e.eventName + (e.remark ? "-" + e.remark : "")
+        });
+      }
     }
+  } catch (e) {
+    debugger;
   }
   return options;
 }

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

@@ -102,8 +102,8 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
     // 列设置 items: any
     // groupHeader groupHeaders: any
   };
-  listView.items = getListColumns(configureCopy);
-  console.log(listView.items, "listView.lListColumns");
+  listView.items = getListColumns(configureCopy, pageDesign);
+  console.log(listView.items, "listView.lListColumns", configureCopy.items);
   listView.groupHeaders = getGroupHeaders(configureCopy);
   return listView;
 }
@@ -173,9 +173,9 @@ function getListColumns(configure, pageDesign) {
       // 内容显示位置
       contAlign: item.props.base ? item.props.base.alignContent : null,
       // 标题显示位置
-      titleAlign: item.props.base ? item.props.base.alignTittle : null
+      titleAlign: item.props.base ? item.props.base.alignTittle : null,
       // 国际化key，如果配置了该列则使用该列的key去查询国际化配置，如果没用配置就以“headerName”字段的值为准
-      // i18nKey: string
+      i18nKey: item.props.base.name
       /**
        * 字段类型为文本，行编辑控件类型为多选下拉框multiselect时，数据库是否存储多个值，用于控制台账查询功能
        * 如果是false表示数据库存储的不是多个值，只是查询时需要多个值使用“等号符号”进行or查询，
@@ -183,6 +183,11 @@ function getListColumns(configure, pageDesign) {
        */
       // ifMultiData: boolean
     };
+    if (pageDesign.i18nKeys) {
+      if (!pageDesign.i18nKeys[item.props.base.name]) {
+        pageDesign.i18nKeys.push(item.props.base.name);
+      }
+    }
     listColumns.push(temp);
   });
   return listColumns;
@@ -372,9 +377,18 @@ function getFileSet(item) {
       }
       if (item.props.uploadConfig.accept) {
         fileSet.accept = item.props.uploadConfig.accept;
+      } else {
+        fileSet.accept = null;
       }
       if (item.props.uploadConfig.limitFileSize) {
         fileSet.limitFileSize = item.props.uploadConfig.limitFileSize;
+      } else {
+        fileSet.limitFileSize = null;
+      }
+      if (item.props.uploadConfig.openCameraOrChoosePhoto) {
+        fileSet.openCameraOrChoosePhoto = item.props.uploadConfig.openCameraOrChoosePhoto;
+      } else {
+        fileSet.openCameraOrChoosePhoto = null;
       }
     }
     return JSON.stringify(fileSet);
@@ -382,6 +396,7 @@ function getFileSet(item) {
   return null;
 }
 function getControlConfig(item) {
+  var _a, _b;
   if (item.name === "select" && item.props.base.multiple) {
     const baseProps = item.props.base;
     const allowCreate = baseProps.allowCreate;
@@ -396,6 +411,13 @@ function getControlConfig(item) {
       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({
+      scanEnable,
+      scanRuleList
+    });
   }
   return null;
 }

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

@@ -34,8 +34,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const pageContextUtil = usePageContextStore();
-    const pageDesign = pageContextUtil.pageContext;
+    const pageDesignContextUtil = usePageContextStore();
+    const pageDesign = pageDesignContextUtil.pageContext;
     const serviceFields = ref([]);
     const showFields = computed(() => {
       return serviceFields.value.filter((item) => {

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

@@ -27,8 +27,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const pageContextUtil = usePageContextStore();
-    const pageDesign = pageContextUtil.pageContext;
+    const pageDesignContextUtil = usePageContextStore();
+    const pageDesign = pageDesignContextUtil.pageContext;
     const serviceFields = ref([]);
     const showFields = computed(() => {
       return serviceFields.value.filter((item) => {

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

@@ -27,8 +27,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const pageContextUtil = usePageContextStore();
-    const pageDesign = pageContextUtil.pageContext;
+    const pageDesignContextUtil = usePageContextStore();
+    const pageDesign = pageDesignContextUtil.pageContext;
     const serviceFields = ref([]);
     const showFields = computed(() => {
       return serviceFields.value.filter((item) => {

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

@@ -23,8 +23,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const pageContextUtil = usePageContextStore();
-    const pageDesign = pageContextUtil.pageContext;
+    const pageDesignContextUtil = usePageContextStore();
+    const pageDesign = pageDesignContextUtil.pageContext;
     const serviceFields = ref([]);
     const showFields = computed(() => {
       return serviceFields.value.filter((item) => {

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

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