super-page-designer 2.0.26 → 2.0.31

package/dist/es/assets/images/data/barcode.png.js

@@ -0,0 +1,4 @@
+const barcode = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAFhJREFUOE9jZKAQMFKon4FRov+/A7IhLwoZD4DEYDRIDpmNbiHEAEaG/WCJ/wyOYMUT/u9/UcDoCJN7UcCIoQ5m0KgBDNBYGA1EKiQkpPRJclKmODNRagAAwFDO2YxzMsgAAAAASUVORK5CYII=";
+export {
+  barcode as default
+};

package/dist/es/assets/images/workflow/workflow-history-img.png.js

@@ -0,0 +1,4 @@
+const workflowHistoryImg = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAQhJREFUOE/Vk78uBGEUxc+ZROIFRLyCSk3YyyZeQC3hm2xEPIFCsgqlTgRrvu21Go3sN1EqdBJPoPII44jJGGPsGH8qX3vP/X33npxL/PGxrX/xVDPRBI5Sx7Vx2hywlGg1InZLgZCGmP0Vr/ln4ATAEzLsVwHZJB5u1vmYA8xr9IFeAMzrDsDcuJ8lHKcxd94BRVNd3El0QGIhONpbzRL1QXSC43IrIJ9wIAs9hl8D6lP9eIJ/CqgbV13jWx6YV4BwGWIetnsw1BDCRkOsz4Njz7wuAExVNWUOugNNZxG2y2IEQXgNjhHYGjmefQIUwWs8JvO6BbEXNnn11cE1Arpes9eO923X+gJGz6QRb1rZ3AAAAABJRU5ErkJggg==";
+export {
+  workflowHistoryImg as default
+};

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

@@ -35,7 +35,6 @@ import groupButton from "../../../assets/images/group-button.png.js";
 import buttonGroup from "../../../assets/images/button/button-group.png.js";
 import groupWorkflow from "../../../assets/images/group-workflow.png.js";
 import workflowButton from "../../../assets/images/workflow/workflow-button.png.js";
-import workflowHistory from "../../../assets/images/workflow/workflow-history.png.js";
 import workflowHistoryTexts from "../../../assets/images/workflow/workflow-history-texts.png.js";
 import groupChart from "../../../assets/images/group-chart.png.js";
 import chartColumn from "../../../assets/images/chart/chart-column.png.js";
@@ -44,6 +43,8 @@ import chartGauge from "../../../assets/images/chart/chart-gauge.png.js";
 import chartRader from "../../../assets/images/chart/chart-radar.png.js";
 import chartScatter from "../../../assets/images/chart/chart-scatter.png.js";
 import formCustom from "../../../assets/images/form/form-custom.png.js";
+import barcode from "../../../assets/images/data/barcode.png.js";
+import workflowHistoryImg from "../../../assets/images/workflow/workflow-history-img.png.js";
 const assemblyGroups = [{
   name: "container",
   label: "容器",
@@ -202,7 +203,8 @@ const assemblyGroups = [{
         { name: "click", label: "点击", tip: "点击" },
         { name: "input", label: "输入", tip: "输入" },
         { name: "change", label: "更改", tip: "更改" },
-        { name: "setValueCallback", label: "弹框赋值回调", tip: "后缀图标弹框赋值回调" },
+        { name: "setValue", label: "弹框赋值回调", tip: "后缀图标弹框赋值回调" },
+        { name: "closePopup", label: "关闭弹框回调", tip: "关闭弹框回调" },
         { name: "blur", label: "失去焦点", tip: "失去焦点" },
         { name: "focus", label: "获取焦点", tip: "获取焦点" },
         { name: "show", label: "显示", tip: "显示元素时执行" },
@@ -680,7 +682,8 @@ const assemblyGroups = [{
       events: [
         { name: "beforeClick", label: "点击前", tip: "点击前" },
         { name: "click", label: "点击", tip: "点击" },
-        { name: "setValueCallback", label: "弹框赋值回调", tip: "弹框赋值回调" },
+        { name: "setValue", label: "弹框赋值回调", tip: "弹框赋值回调" },
+        { name: "closePopup", label: "关闭弹框回调", tip: "关闭弹框回调" },
         { name: "show", label: "显示", tip: "显示元素时执行" },
         { name: "hidden", label: "隐藏", tip: "隐藏元素时执行" }
       ],
@@ -706,7 +709,7 @@ const assemblyGroups = [{
           type: "",
           suffixModule: {
             jumpPageAdditional: [],
-            icon: "111"
+            icon: ""
           },
           dynamicDataSourceCode: ""
         },
@@ -812,7 +815,8 @@ const assemblyGroups = [{
         events: [
           { name: "beforeValidateForm", label: "验证数据前", tip: "行编辑保存时验证数据前，先于beforeClick事件" },
           { name: "beforeClick", label: "点击前事件", tip: "点击前事件" },
-          { name: "setValueCallback", label: "弹框赋值回调", tip: "弹框赋值回调" },
+          { name: "setValue", label: "弹框赋值回调", tip: "弹框赋值回调" },
+          { name: "closePopup", label: "关闭弹框回调", tip: "关闭弹框回调" },
           { name: "click", label: "点击事件", tip: "点击事件" },
           { name: "afterClick", label: "点击后事件", tip: "点击后事件" },
           { name: "show", label: "显示", tip: "显示" },
@@ -825,7 +829,17 @@ const assemblyGroups = [{
         uuid: getUuidv4(),
         name: "",
         props: {
-          base: { name: "复选框", prop: "$selection", tittleShow: true, columnWidth: 80, visible: true, sortable: true, displayOrder: 0 },
+          base: {
+            name: "复选框组件",
+            prop: "$selection",
+            tittleShow: true,
+            columnWidth: 100,
+            visible: true,
+            sortable: true,
+            displayOrder: 0,
+            alignTittle: "center",
+            alignContent: "center"
+          },
           size: {},
           editLine: {},
           scan: {},
@@ -848,7 +862,7 @@ const assemblyGroups = [{
             type: "",
             suffixModule: {
               jumpPageAdditional: [],
-              icon: "111"
+              icon: ""
             }
           }
         },
@@ -872,7 +886,17 @@ const assemblyGroups = [{
         uuid: getUuidv4(),
         name: "",
         props: {
-          base: { name: "序号", prop: "$index", tittleShow: true, columnWidth: 80, visible: true, sortable: true, displayOrder: 1 },
+          base: {
+            name: "序号",
+            prop: "$index",
+            tittleShow: true,
+            columnWidth: 80,
+            visible: true,
+            sortable: true,
+            displayOrder: 1,
+            alignTittle: "center",
+            alignContent: "center"
+          },
           size: {},
           editLine: {},
           scan: {},
@@ -895,7 +919,7 @@ const assemblyGroups = [{
             type: "",
             suffixModule: {
               jumpPageAdditional: [],
-              icon: "111"
+              icon: ""
             }
           }
         },
@@ -920,7 +944,17 @@ const assemblyGroups = [{
         uuid: getUuidv4(),
         name: "",
         props: {
-          base: { name: "操作", title: "操作", prop: "operation", tittleShow: true, columnWidth: 150, visible: true, sortable: true },
+          base: {
+            name: "操作",
+            title: "操作",
+            prop: "operation",
+            tittleShow: true,
+            columnWidth: 150,
+            visible: true,
+            sortable: true,
+            alignTittle: "center",
+            alignContent: "center"
+          },
           size: {},
           editLine: {},
           scan: {},
@@ -943,7 +977,7 @@ const assemblyGroups = [{
             type: "",
             suffixModule: {
               jumpPageAdditional: [],
-              icon: "111"
+              icon: ""
             }
           }
         },
@@ -1008,8 +1042,8 @@ const assemblyGroups = [{
         principalLinkage: "",
         querySetList: [{ type: 1, name: 1 }],
         returnSetList: [],
-        sqlFilterCondition: "[]",
-        defaultQueryCriteria: "[]",
+        sqlFilterCondition: [],
+        defaultQueryCriteria: [],
         unfoldConent: `<el-form :model="form" label-width="auto" style="max-width: 600px">
             <el-form-item label="Activity name">
              <el-input v-model="form.name" />
@@ -1047,6 +1081,16 @@ const assemblyGroups = [{
   }, {
     name: "tree",
     label: "树控件",
+    events: [
+      { name: "show", label: "显示", tip: "显示" },
+      { name: "hidden", label: "隐藏", tip: "隐藏" },
+      { name: "node-click", label: "节点点击", tip: "当节点被点击的时候触发" },
+      { name: "check-change", label: "复选框点击", tip: "当复选框被点击的时候触发" },
+      { name: "check", label: "复选框点击后", tip: "点击节点复选框之后触发" },
+      { name: "add-node", label: "增加节点", tip: "增加节点触发" },
+      { name: "update-node", label: "修改节点", tip: "修改节点触发" },
+      { name: "delete-node", label: "移除节点", tip: "删除节点触发" }
+    ],
     icon: dataTree,
     props: {
       base: {},
@@ -1115,7 +1159,7 @@ const assemblyGroups = [{
   }, {
     name: "bar-code",
     label: "条码",
-    icon: "",
+    icon: barcode,
     props: { base: { type: "QR-code" }, verification: [], scan: {}, preSuffix: {}, prefix: {}, size: {}, title: {} },
     style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
     designComponent: defineAsyncComponent(() => {
@@ -1149,13 +1193,11 @@ const assemblyGroups = [{
         condition: [{
           sqlFilterCondition: "[]"
         }],
-        setValueList: [{
-          combination: "[]"
-        }],
         showCondition: "[]",
         type: "primary",
         logSetting: []
       },
+      setValueList: [{}],
       linkPage: {},
       verification: [],
       scan: {},
@@ -1169,7 +1211,8 @@ const assemblyGroups = [{
       { name: "beforeValidateForm", label: "验证表单前", tip: "验证表单前，先于beforeClick事件" },
       { name: "beforeClick", label: "点击前事件", tip: "点击前事件" },
       { name: "click", label: "点击事件", tip: "点击事件" },
-      { name: "setValueCallback", label: "弹框赋值回调", tip: "弹框赋值回调" },
+      { name: "setValue", label: "弹框赋值回调", tip: "弹框赋值回调" },
+      { name: "closePopup", label: "关闭弹框回调", tip: "关闭弹框回调" },
       { name: "afterClick", label: "点击后事件", tip: "点击后事件" },
       { name: "show", label: "显示", tip: "显示" },
       { name: "hidden", label: "隐藏", tip: "隐藏" }
@@ -1248,6 +1291,51 @@ const assemblyGroups = [{
     attrComponent: defineAsyncComponent(() => {
       return import("../views/assemblys/button/dropdown/dropdown-attr.vue.js");
     })
+  }, {
+    name: "print-label",
+    label: "打印标签",
+    icon: buttonGroup,
+    //设计时的样式
+    design: {
+      style: {
+        "display": "inline-block"
+      }
+    },
+    props: {
+      base: {
+        title: "打印标签",
+        type: "primary"
+      },
+      dropdown: {},
+      dataOrigin: {
+        optionValueSetType: "",
+        staticState: [],
+        json: `[
+        {"label":"1"},
+        {"label":"2"},
+        {"label":"3"}
+      ]`
+      },
+      verification: [],
+      scan: {},
+      preSuffix: {},
+      prefix: {},
+      size: {},
+      title: {}
+    },
+    style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
+    events: [
+      { name: "show", label: "显示", tip: "显示" },
+      { name: "hidden", label: "隐藏", tip: "隐藏" },
+      { name: "beforeClick", label: "点击前事件", tip: "点击前事件" },
+      { name: "click", isEdit: false, label: "点击事件", tip: "点击事件", title: "打印标签", eventName: "printLabel", isStandard: true }
+    ],
+    designComponent: defineAsyncComponent(() => {
+      return import("../views/assemblys/button/print-label/printlabel-design.vue.js");
+    }),
+    attrComponent: defineAsyncComponent(() => {
+      return import("../views/assemblys/button/print-label/printlabel-attr.vue.js");
+    })
   }]
 }, {
   name: "workflow",
@@ -1805,7 +1893,7 @@ const assemblyGroups = [{
   }, {
     name: "picture-flow",
     label: "图形历史",
-    icon: workflowHistory,
+    icon: workflowHistoryImg,
     props: { base: {}, verification: [], scan: {}, preSuffix: {}, prefix: {}, size: {}, title: {} },
     style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
     events: [
@@ -2140,6 +2228,14 @@ const standardButtonOperations = [
       label: "取消编辑",
       value: "restoreEdit"
     }]
+  },
+  {
+    label: "统计图功能",
+    type: "chart",
+    options: [{
+      label: "统计",
+      value: "queryCharts"
+    }]
   }
 ];
 function getDesignComponentByName(name) {

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

@@ -2,7 +2,7 @@ import { getUuidv4 } from "./common-util.js";
 import eventBus from "./eventBus.js";
 function formatConditionList(conditionList, attributeMap, fieldMap) {
   if (conditionList) {
-    const jsonStr = JSON.parse(conditionList);
+    const jsonStr = conditionList;
     conditionList = [];
     for (const i2 in jsonStr) {
       conditionList.push(jsonStr[i2]);
@@ -21,8 +21,8 @@ function formatConditionList(conditionList, attributeMap, fieldMap) {
             return operItem.name === item.operator;
           });
           returnStr += item.leftBracket;
-          if (fieldMap[item.propName] && fieldMap[item.propName].label) {
-            returnStr += fieldMap[item.propName].label + " ";
+          if (fieldMap[item.propName] && fieldMap[item.propName].alias) {
+            returnStr += fieldMap[item.propName].alias + " ";
           }
           if (operator && operator.length > 0) {
             returnStr += operator[0].label + " ";
@@ -254,6 +254,9 @@ function getChildrenList(parentUuid, groupHeaders) {
 function getTopGroupHeaderColumnList(groupHeaders, columnItems) {
   console.log("组合表头---groupHeaders=====", groupHeaders);
   let topGroupHeaderList = [];
+  if (!groupHeaders) {
+    return topGroupHeaderList;
+  }
   let compositeHeaderFieldGroup = [];
   groupHeaders.forEach((item) => {
     if (item.columnUuid) {
@@ -306,8 +309,14 @@ function getColumnsWithGroupHeader(tableConfigure) {
   let columns = [];
   let tableColumns = tableConfigure.items;
   let groupHeaders = tableConfigure.props.groupHeaders;
-  if (!groupHeaders || groupHeaders.length === 0) {
-    columns = tableColumns.sort((a, b) => a.props.base.displayOrder - b.props.base.displayOrder);
+  if (tableColumns && (!groupHeaders || groupHeaders.length === 0)) {
+    columns = tableColumns.sort((a, b) => {
+      if (a.props.base) {
+        return a.props.base.displayOrder - b.props.base.displayOrder;
+      } else {
+        return 0;
+      }
+    });
   } else {
     columns = getTopGroupHeaderColumnList(groupHeaders, tableColumns);
     columns.forEach((item) => getAllChildrenList(item, groupHeaders, tableColumns));

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

@@ -147,8 +147,8 @@ function caculateComponentProps(configure, property) {
   if (defineProps.base && defineProps.base.placeholder) {
     tempProps["placeholder"] = defineProps.base.placeholder;
   }
-  if (defineProps.base && defineProps.base.clearable) {
-    tempProps["clearable"] = true;
+  if (defineProps.base && defineProps.base.clearable != void 0) {
+    tempProps["clearable"] = defineProps.base.clearable;
   }
   if (defineProps.base && defineProps.base.showInputNum) {
     tempProps["showInputNum"] = true;
@@ -294,6 +294,7 @@ function columnTittleStyle(configure) {
   if (defineStyle.tittlePaddingLeft) {
     tempTittleStyle["padding-left"] = defineStyle.tittlePaddingLeft + "px";
   }
+  tempTittleStyle["cursor"] = "pointer";
   if (defineStyle.tittleStyleCustom) {
     const strs = defineStyle.tittleStyleCustom.replace(/[\r\n]/g, "").split(";");
     for (let index = 0; index < strs.length; index++) {

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

@@ -1,4 +1,4 @@
-export declare function queryWorkflowsRequest(tableName: any): any;
-export declare function createWorkflowRequest(tableName: any, pageName: any): any;
+export declare function queryWorkflowsRequest(tableName: any, systemCode: any, publishVersion: any): any;
+export declare function createWorkflowRequest(tableName: any, pageName: any, systemCode: any, publishVersion: any): any;
 export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any, publishVersion: any): any;
 export declare function getPublishVersionsByCode(systemCode: any): any;

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

@@ -1,9 +1,8 @@
 import http from "agilebuilder-ui/src/utils/request";
-import { getSystemCode, getPublishVersion } from "./system.js";
-function queryWorkflowsRequest(tableName) {
+function queryWorkflowsRequest(tableName, systemCode, publishVersion) {
   const params = {
-    appCode: getSystemCode(),
-    publishVersion: getPublishVersion(),
+    appCode: systemCode,
+    publishVersion,
     tableName
   };
   return http.post(
@@ -11,10 +10,10 @@ function queryWorkflowsRequest(tableName) {
     params
   );
 }
-function createWorkflowRequest(tableName, pageName) {
+function createWorkflowRequest(tableName, pageName, systemCode, publishVersion) {
   const params = {
-    appCode: getSystemCode(),
-    publishVersion: getPublishVersion(),
+    appCode: systemCode,
+    publishVersion,
     tableName,
     pageName
   };
@@ -36,14 +35,8 @@ function getHighestVersionDefinition(wfDefinitionCode, defVersion, publishVersio
     params
   );
 }
-function getPublishVersionsByCode(systemCode) {
-  return http.get(
-    window["$vueApp"].config.globalProperties.baseAPI + `/mms/systems/getPublishVersionsByCode/${systemCode}`
-  );
-}
 export {
   createWorkflowRequest,
   getHighestVersionDefinition,
-  getPublishVersionsByCode,
   queryWorkflowsRequest
 };

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

@@ -0,0 +1,21 @@
+import { usePageContextStore } from "../../../stores/page-store.js";
+function getCustomFuncs() {
+  const pageDesign = usePageContextStore().pageContext;
+  const options = [];
+  if (!pageDesign || !pageDesign.customEvents) {
+    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 : "")
+      });
+    }
+  }
+  return options;
+}
+export {
+  getCustomFuncs
+};

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

@@ -13,7 +13,10 @@ function queryTableFieldsOrMap(systemCode, systemVersion, tableName) {
     publishVersion: systemVersion,
     tableName
   };
-  return http.get(window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns/findAttributeMap", param);
+  return http.get(
+    window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns/findAttributeMap",
+    param
+  );
 }
 function querySublist(systemCode, systemVersion, publishVersion) {
   const param = {
@@ -38,7 +41,7 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
   delete tableConfigure.runtime;
 }
 function getListView(configureCopy, pageDesign, tableConfigureStr) {
-  const listCode = pageDesign.code + "__V" + pageDesign.pageVersion + "__" + configureCopy.uuid;
+  const listCode = "V" + pageDesign.version + "__" + pageDesign.code + "__" + configureCopy.uuid;
   const listView = {
     configure: tableConfigureStr,
     // uuid
@@ -46,21 +49,21 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
     // 名称
     name: configureCopy.label,
     // 合计方式，不合计（no)，当前页(current)，所有页(all),使用radio选择
-    totalType: configureCopy.props.base.totalType,
+    totalType: configureCopy.props.base ? configureCopy.props.base.totalType : null,
     // 备注
-    remark: configureCopy.props.base.remark,
+    remark: configureCopy.props.base ? configureCopy.props.base.remark : null,
     // 是否分页
-    pagination: configureCopy.props.base.paging,
+    pagination: configureCopy.props.base ? configureCopy.props.base.subPaging : null,
     // 默认行数
-    rowNum: configureCopy.props.base.pageSize,
+    rowNum: configureCopy.props.base ? configureCopy.props.base.pageSize : null,
     // 可选行数
-    optionalRows: configureCopy.props.base.pageSizes,
+    optionalRows: configureCopy.props.base ? configureCopy.props.base.pageSizes : null,
     // 布局
-    layout: JSON.stringify(configureCopy.props.base.layout),
+    layout: configureCopy.props.base ? JSON.stringify(configureCopy.props.base.layout) : null,
     // 查询方式,不查询（no），内置查询（buildin），自定义查询（custom）
-    startQuery: configureCopy.props.base.startQuery,
+    startQuery: configureCopy.props.base ? configureCopy.props.base.startQuery : null,
     // 是否是弹出式查询(true为弹出，false为嵌入)
-    popUp: configureCopy.props.base.popUp,
+    popUp: configureCopy.props.base ? configureCopy.props.base.popUp : null,
     // 是否高级查询 isAdvancedQuery: boolean
     // 是否启用模糊查询-暂不使用 isSearchFaint: boolean
     // 是否初始化查询
@@ -68,20 +71,20 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
     // 默认查询条件
     defaultQueryCriteria: configureCopy.props.dataOrigin.defaultQueryCriteria,
     // 查询表单label位置
-    queryLabelPosition: configureCopy.props.base.queryLabelPosition,
+    queryLabelPosition: configureCopy.props.base ? configureCopy.props.base.queryLabelPosition : null,
     // 是否需要操作:增改
-    editable: configureCopy.props.base.editable,
+    editable: configureCopy.props.base ? configureCopy.props.base.editable : null,
     // 操作列宽设置 columnWidth: number
     // 行顺序字段名称 fieldForOrder: string
     // 保存行顺序的url urlToSaveOrder: string
     // 保存行信息的url urlToSaveRow: string
     // 删除行信息的url urlToDeleteRow: string
     // 显示列表内容的url，如果列表组件没有传url属性，则该url为准。
-    urlToListData: configureCopy.props.base.urlToListData,
+    urlToListData: configureCopy.props.base ? configureCopy.props.base.urlToListData : null,
     // 是否是sql查询列表内容。影响到列表内容显示。
     isSql: true,
     // 列表组件中是否显示“字段配置”按钮
-    customConfig: configureCopy.props.base.customConfig,
+    customConfig: configureCopy.props.base ? configureCopy.props.base.customConfig : null,
     // 数据表
     tableName: configureCopy.props.dataOrigin.tableName,
     // 系统编码 systemCode: string
@@ -91,17 +94,17 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
     // 默认排序字段
     defaultSortField: JSON.stringify(configureCopy.props.dataOrigin.sortField),
     // 标题显示位置
-    titleAlign: configureCopy.props.base.alignTittle,
+    titleAlign: configureCopy.props.base ? configureCopy.props.base.alignTittle : null,
     // 内容显示位置
-    contAlign: configureCopy.props.base.alignContent,
+    contAlign: configureCopy.props.base ? configureCopy.props.base.alignContent : null,
     // 显示效果
-    displayEffect: configureCopy.props.base.displayEffect,
+    displayEffect: configureCopy.props.base ? configureCopy.props.base.displayEffect : null,
     // 封面图片附件的名称 imageName: string
     // 封面图片附件的uuid imageUuid: string
     // 是否支持拖拽列自定义列顺序
-    isDragColumn: configureCopy.props.base.isDragColumn,
+    isDragColumn: configureCopy.props.base ? configureCopy.props.base.isDragColumn : null,
     // 是否显示边框
-    border: configureCopy.props.base.border
+    border: configureCopy.props.base ? configureCopy.props.base.border : null
     // 国际化key i18nKey: string
     // 列设置 items: any
     // groupHeader groupHeaders: any
@@ -114,7 +117,7 @@ function getListColumns(configure, pageDesign) {
   var _a;
   const listColumns = [];
   (_a = configure.items) == null ? void 0 : _a.forEach((item) => {
-    const listColumn = { controlName: getControlName(item.name) };
+    const listColumn = { controlName: getControlName(item) };
     const temp = {
       // 列头名
       headerName: item.props.base.name,
@@ -135,7 +138,7 @@ function getListColumns(configure, pageDesign) {
       //冻结列 left right false
       listColumnFixed: item.props.base.listColumnFixed,
       // 格式设置
-      format: item.props.format,
+      format: getPropsFormat(item),
       //值设置，以逗号隔开:数据库值:显示的值,数据库值:显示的值...
       valueSet: getListColumnValueSet(item),
       // 查询设置  no 不查询 normal 普通查询 advanced 高级查询
@@ -174,7 +177,7 @@ function getListColumns(configure, pageDesign) {
       // 校验的类型
       checkType: configure.props.verification.type,
       // 内容显示位置
-      contAlign: configure.props.base.alignContent
+      contAlign: configure.props.base ? configure.props.base.alignContent : null
       // 国际化key，如果配置了该列则使用该列的key去查询国际化配置，如果没用配置就以“headerName”字段的值为准
       // i18nKey: string
       /**
@@ -192,23 +195,33 @@ function getGroupHeaders(configure) {
   const result = [];
   if (configure.props.groupHeaders) {
     configure.props.groupHeaders.forEach((item) => {
-      result.push({
+      const header = {
         titleText: item.titleText,
-        prop: item.props.base.prop,
         parentCode: item.parentUuid,
         displayOrder: item.displayOrder,
         uuid: item.uuid
-      });
+      };
+      if (item.props.base && item.props.base.prop) {
+        header.prop = getNameFromProp(item.props.base.prop);
+      }
+      result.push(header);
     });
   }
   return result;
 }
 function getListColumnValueSet(item, listColumn) {
   const configureProps = item.props;
+  if (item.name === "inputNumber") {
+    return null;
+  }
   if (configureProps.dataOrigin && configureProps.dataOrigin.optionValueSetType) {
     const optionType = configureProps.dataOrigin.optionValueSetType;
     if (optionType === "static") {
-      return optionType + ":" + configureProps.dataOrigin.staticStates;
+      const valueSets = [];
+      configureProps.dataOrigin.staticStates.forEach((element) => {
+        valueSets.push(element.value + ":" + element.label);
+      });
+      return valueSets.join(",");
     } else if (optionType === "optionGroup") {
       return optionType + ":" + configureProps.dataOrigin.optionGroup;
     } else if (optionType === "dynamicData") {
@@ -234,7 +247,7 @@ function getValueSetOptions(item) {
       configureProps.dataOrigin.autoSets.forEach((element) => {
         const target = getNameFromProp(element.target);
         valueSetOptions.push({
-          columnName: element.source,
+          columnName: getNameFromProp(element.source),
           valueField: target,
           valueColumn: { name: target, dbColumnName: target.toUpperCase() }
         });
@@ -263,10 +276,16 @@ function getControlName(item) {
       return "switch";
     case "select":
       return getSelectControlName(item);
+    case "radio":
+      return "select";
+    case "checkbox":
+      return "multiselect";
     case "datePicker":
       return getDatePickerControlName(item);
     case "dept-tree":
       return getOrgTreeControlName(item);
+    case "inputNumber":
+      return "inputNumber";
     default:
       return "input";
   }
@@ -278,7 +297,7 @@ function getSelectControlName(item) {
   return "select";
 }
 function getDatePickerControlName(item) {
-  switch (item.props.base.dateType) {
+  switch (item.props.base.type) {
     case "date":
       return "date";
     case "time":
@@ -323,7 +342,7 @@ function getOrgTreeSet(item) {
     const orgTreeSetArr = [];
     if (item.props.base.otherFieldSets && item.props.base.otherFieldSets.length > 0) {
       item.props.base.otherFieldSets.forEach((filedSet) => {
-        orgTreeSetArr.push({ type: filedSet.source, model: filedSet.target });
+        orgTreeSetArr.push({ type: filedSet.source, model: getNameFromProp(filedSet.target) });
       });
     }
     return JSON.stringify({ orgTreeSetArr });
@@ -360,10 +379,20 @@ function getControlConfig(item) {
   }
   return null;
 }
+function getPropsFormat(item) {
+  if (item.props.format && item.props.format.type === "hyperlinks") {
+    const format = JSON.parse(JSON.stringify(item.props.format));
+    Object.assign(format, item.props.linkPage);
+    return JSON.stringify(format);
+  }
+  return JSON.stringify(item.props.format);
+}
 function getNameFromProp(prop) {
-  const match = prop.match(/\${(.*?)\.(.*?)}/);
-  if (match) {
-    return match[2];
+  if (prop) {
+    const match = prop.match(/\${(.*?)\.(.*?)}/);
+    if (match) {
+      return match[2];
+    }
   }
   return prop;
 }