super-page-designer 2.0.41 → 2.0.45

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

@@ -55,8 +55,66 @@ const tableOperateColumnConf = {
       prop: "operation",
       columnWidth: 150,
       sortable: true,
+      displayOrder: 3,
       visible: true,
       alignTittle: "center",
+      alignContent: "center",
+      listColumnFixed: "right"
+    },
+    size: {},
+    editLine: {},
+    scan: {},
+    preSuffix: {},
+    verification: {},
+    dataOrigin: {
+      sortField: [{ name: "", type: "" }],
+      staticState: [{ label: "选项1", vaule: 1 }],
+      displayQuantity: 20
+    },
+    defaultValue: {},
+    inParameter: {},
+    title: {},
+    definition: {},
+    uploadConfig: {},
+    singleWidth: {},
+    suffixModule: {},
+    querySetting: {},
+    formatting: {
+      type: "",
+      suffixModule: {
+        jumpPageAdditional: [],
+        icon: ""
+      }
+    }
+  },
+  events: [
+    { name: "show", label: "列表显示", tip: "列表显示回调方法" },
+    { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
+  ],
+  style: {
+    titleFont: {},
+    contentFont: {},
+    width: {},
+    background: {},
+    conentPadding: {},
+    tittlePadding: {},
+    border: {},
+    shadow: {},
+    tittleClass: ""
+  }
+};
+const tableIndexColumnConf = {
+  uuid: getUuidv4(),
+  name: "",
+  props: {
+    base: {
+      name: "序号",
+      prop: "$index",
+      columnWidth: 80,
+      sortable: true,
+      visible: true,
+      displayOrder: 1,
+      alignTittle: "center",
       alignContent: "center"
     },
     size: {},
@@ -94,6 +152,7 @@ const tableOperateColumnConf = {
     contentFont: {},
     width: {},
     background: {},
+    tableCell: [{ type: "", model: "" }],
     conentPadding: {},
     tittlePadding: {},
     border: {},
@@ -101,6 +160,120 @@ const tableOperateColumnConf = {
     tittleClass: ""
   }
 };
+const tableSelectionColumnConf = {
+  uuid: getUuidv4(),
+  name: "",
+  props: {
+    base: {
+      name: "复选框组件",
+      prop: "$selection",
+      columnWidth: 100,
+      sortable: true,
+      visible: true,
+      displayOrder: 0,
+      alignTittle: "center",
+      alignContent: "center"
+    },
+    size: {},
+    editLine: {},
+    scan: {},
+    preSuffix: {},
+    verification: {},
+    dataOrigin: {
+      sortField: [{ name: "", type: "" }],
+      staticState: [{ label: "选项1", vaule: 1 }],
+      displayQuantity: 20
+    },
+    defaultValue: {},
+    inParameter: {},
+    title: {},
+    definition: {},
+    uploadConfig: {},
+    singleWidth: {},
+    suffixModule: {},
+    querySetting: {},
+    formatting: {
+      type: "",
+      suffixModule: {
+        jumpPageAdditional: [],
+        icon: ""
+      }
+    }
+  },
+  events: [
+    { name: "show", label: "列表显示", tip: "列表显示回调方法" },
+    { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
+  ],
+  style: {
+    titleFont: {},
+    contentFont: {},
+    width: {},
+    background: {},
+    conentPadding: {},
+    tittlePadding: {},
+    border: {},
+    shadow: {},
+    tittleClass: ""
+  }
+};
+function getTableColumnConf(fieldInfo) {
+  return {
+    uuid: getUuidv4(),
+    isTable: true,
+    // 是否是表格组件
+    name: "",
+    edit: fieldInfo ? fieldInfo.edit : false,
+    dataType: fieldInfo ? fieldInfo.dataType : "",
+    props: {
+      base: {
+        prop: fieldInfo ? fieldInfo.dbColumnName : "",
+        name: fieldInfo ? fieldInfo.alias : "",
+        tittleShow: false,
+        visible: true,
+        displayOrder: fieldInfo ? fieldInfo.displayOrder : 1,
+        sortable: true,
+        alignTittle: "center",
+        alignContent: "center"
+      },
+      size: {},
+      editLine: { plugType: "" },
+      scan: {},
+      preSuffix: {},
+      verification: {},
+      dataOrigin: {
+        sortField: [{ name: "", type: "" }],
+        staticState: [{ label: "选项1", vaule: 1 }],
+        displayQuantity: 20
+      },
+      defaultValue: {},
+      inParameter: {},
+      title: {},
+      definition: {},
+      uploadConfig: {},
+      singleWidth: {},
+      suffixModule: {},
+      querySetting: {},
+      orgFields: [{ type: "", model: "" }],
+      format: { type: "", icon: "", suffixModule: { staticStates: [] }, jumpPageAdditional: { staticStates: [] } }
+    },
+    events: [
+      { name: "setValue", label: "弹框赋值回调", tip: "格式化配置超链接赋值回调" },
+      { name: "closePopup", label: "关闭弹框回调", tip: "格式化配置超链接关闭弹框回调" }
+    ],
+    style: {
+      titleFont: {},
+      contentFont: {},
+      width: {},
+      background: {},
+      tableCell: [{ value: "", label: "" }],
+      conentPadding: {},
+      tittlePadding: {},
+      border: {},
+      shadow: {},
+      tittleClass: ""
+    }
+  };
+}
 const assemblyGroups = [{
   name: "container",
   label: "容器",
@@ -477,7 +650,7 @@ const assemblyGroups = [{
         { name: "change", label: "确定更改日期", tip: "用户确认选定的值时触发" },
         { name: "blur", label: "获取焦点", tip: "获取焦点" },
         { name: "focus", label: "失去焦点", tip: "失去焦点" },
-        { name: "calendar-change", label: "日历更改所选日期事件", tip: "在日历所选日期更改时触发" },
+        // {name:'calendar-change',label: '日历更改所选日期事件', tip:'在日历所选日期更改时触发' },
         { name: "panel-change", label: "日期面板改变事件", tip: "当日期面板改变时触发" },
         { name: "visible-change", label: "下拉列表出现/消失事件", tip: "当picker的下拉列表出现/消失时触发" },
         { name: "show", label: "显示", tip: "显示元素时执行" },
@@ -1062,121 +1235,8 @@ const assemblyGroups = [{
       }
     ],
     items: [
-      {
-        uuid: getUuidv4(),
-        name: "",
-        props: {
-          base: {
-            name: "复选框组件",
-            prop: "$selection",
-            tittleShow: true,
-            columnWidth: 100,
-            visible: true,
-            sortable: true,
-            displayOrder: 0,
-            alignTittle: "center",
-            alignContent: "center"
-          },
-          size: {},
-          editLine: {},
-          scan: {},
-          preSuffix: {},
-          verification: {},
-          dataOrigin: {
-            sortField: [{ name: "", type: "" }],
-            staticState: [{ label: "选项1", vaule: 1 }],
-            displayQuantity: 20
-          },
-          defaultValue: {},
-          inParameter: {},
-          title: {},
-          definition: {},
-          uploadConfig: {},
-          singleWidth: {},
-          suffixModule: {},
-          querySetting: {},
-          formatting: {
-            type: "",
-            suffixModule: {
-              jumpPageAdditional: [],
-              icon: ""
-            }
-          }
-        },
-        events: [
-          { name: "show", label: "列表显示", tip: "列表显示回调方法" },
-          { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
-        ],
-        style: {
-          titleFont: {},
-          contentFont: {},
-          width: {},
-          background: {},
-          conentPadding: {},
-          tittlePadding: {},
-          border: {},
-          shadow: {},
-          tittleClass: ""
-        }
-      },
-      {
-        uuid: getUuidv4(),
-        name: "",
-        props: {
-          base: {
-            name: "序号",
-            prop: "$index",
-            tittleShow: true,
-            columnWidth: 80,
-            visible: true,
-            sortable: true,
-            displayOrder: 1,
-            alignTittle: "center",
-            alignContent: "center"
-          },
-          size: {},
-          editLine: {},
-          scan: {},
-          preSuffix: {},
-          verification: {},
-          dataOrigin: {
-            sortField: [{ name: "", type: "" }],
-            staticState: [{ label: "选项1", vaule: 1 }],
-            displayQuantity: 20
-          },
-          defaultValue: {},
-          inParameter: {},
-          title: {},
-          definition: {},
-          uploadConfig: {},
-          singleWidth: {},
-          suffixModule: {},
-          querySetting: {},
-          formatting: {
-            type: "",
-            suffixModule: {
-              jumpPageAdditional: [],
-              icon: ""
-            }
-          }
-        },
-        events: [
-          { name: "show", label: "列表显示", tip: "列表显示回调方法" },
-          { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
-        ],
-        style: {
-          titleFont: {},
-          contentFont: {},
-          width: {},
-          background: {},
-          tableCell: [{ type: "", model: "" }],
-          conentPadding: {},
-          tittlePadding: {},
-          border: {},
-          shadow: {},
-          tittleClass: ""
-        }
-      },
+      tableSelectionColumnConf,
+      tableIndexColumnConf,
       tableOperateColumnConf
     ],
     modelFields: [],
@@ -2377,6 +2437,16 @@ function getTableOperateConf() {
   conf.uuid = getUuidv4();
   return conf;
 }
+function getTableIndexConf() {
+  const conf = deepCopy(tableIndexColumnConf);
+  conf.uuid = getUuidv4();
+  return conf;
+}
+function getTableSelectionConf() {
+  const conf = deepCopy(tableSelectionColumnConf);
+  conf.uuid = getUuidv4();
+  return conf;
+}
 const standardButtonOperations = [
   {
     label: "表单标准功能",
@@ -2542,6 +2612,19 @@ function getDesignComponentByName(name) {
   }
   return null;
 }
+function getDesignEvents(name) {
+  if (!name)
+    return [];
+  for (let i = 0; i < assemblyGroups.length; i++) {
+    let items = assemblyGroups[i].items;
+    for (let j = 0; j < items.length; j++) {
+      let item = items[j];
+      if (item.name == name) {
+        return item.events;
+      }
+    }
+  }
+}
 function getDesignConfByName(name) {
   if (!name) {
     return null;
@@ -2607,8 +2690,12 @@ export {
   getComponentEventOptions,
   getDesignComponentByName,
   getDesignConfByName,
+  getDesignEvents,
   getFormComponentOptions,
   getPageConf,
+  getTableColumnConf,
+  getTableIndexConf,
   getTableOperateConf,
+  getTableSelectionConf,
   standardButtonOperations
 };

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

@@ -490,16 +490,16 @@ function generateSeriesJson(serieConfigure) {
     label: {},
     itemStyle: {},
     lineStyle: {},
-    emphasis: {
-      disabled: true,
-      itemStyle: {
-        color: "#E3E8C0",
-        borderWidth: 1,
-        borderType: "dashed",
-        borderColor: "#878773"
-      }
-    }
+    emphasis: {}
   };
+  if (serieConfigure.type === "bar") {
+    tempSerie.emphasis.itemStyle = {
+      color: "#E3E8C0",
+      borderWidth: 1,
+      borderType: "dashed",
+      borderColor: "#878773"
+    };
+  }
   if (itemStyle.enableLabel != void 0) {
     tempSerie.label.show = itemStyle.enableLabel;
     if (itemStyle.labelPosition) {

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

@@ -25,7 +25,7 @@ export declare function removComponentOptionConfigs(configure: Component): void;
  * @param {*}
  * @return {*}
  */
-export declare function columnTittleStyle(configure: any): void;
+export declare function columnTittleStyle(configure: any): any;
 export declare function columnCustomTittleClass(configure: any): void;
 export declare function columnContentStyle(configure: any): void;
 export declare function columnContentClass(configure: any): void;

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

@@ -232,33 +232,33 @@ export interface ListColumn {
     total: boolean;
     listColumnFixed: string;
     format: string;
-    valueSet: string;
-    querySettingName: string;
-    queryMatching: string;
-    querySetting: string;
+    valueSet: string | null | undefined;
+    querySettingName: string | null | undefined;
+    queryMatching: string | null | undefined;
+    querySetting: string | null | undefined;
     editable: boolean;
     defaultValue: string;
-    controlName: string;
-    controlConfig: string;
-    eventType: string;
+    controlName: string | null | undefined;
+    controlConfig: string | null | undefined;
+    eventType?: string;
     /**
      * 显示顺序，多层级关系，可能值有重复
      * 如有第一层级的顺序1，有第二层级的顺序1
      */
     displayOrder: number;
-    fileSet: string;
-    orgTreeSet: string;
-    dynamicColumnJson: string;
-    valueSetOptions: string;
+    fileSet: string | null | undefined;
+    orgTreeSet: string | null | undefined;
+    dynamicColumnJson?: string;
+    valueSetOptions: string | null | undefined;
     required: boolean;
     pattern: string;
     checkType: string;
     contAlign: string;
-    i18nKey: string;
+    i18nKey?: string;
     /**
      * 字段类型为文本，行编辑控件类型为多选下拉框multiselect时，数据库是否存储多个值，用于控制台账查询功能
      * 如果是false表示数据库存储的不是多个值，只是查询时需要多个值使用“等号符号”进行or查询，
      * 如果是true表示数据库存储了多个值（一般是以逗号隔开），则查询时需要多个值使用“包含符号”进行or查询。
      */
-    ifMultiData: boolean;
+    ifMultiData?: boolean;
 }

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

@@ -118,7 +118,7 @@ function getListColumns(configure, pageDesign) {
   const listColumns = [];
   (_a = configure.items) == null ? void 0 : _a.forEach((item) => {
     const listColumn = { controlName: getControlName(item) };
-    const temp = {
+    let temp = {
       // 列头名
       headerName: item.props.base.name,
       //对应数据表字段名字。(listColumn的tableColumn）占位符列和$selection、$index两列时为固定值(listColumn的prop）
@@ -187,6 +187,9 @@ function getListColumns(configure, pageDesign) {
        */
       // ifMultiData: boolean
     };
+    if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
+      formatDynamicColumnData(item, temp);
+    }
     listColumns.push(temp);
   });
   return listColumns;
@@ -381,7 +384,6 @@ function getControlConfig(item) {
 }
 function getPropsFormat(item) {
   if (item.props.format && item.props.format.type === "hyperlinks") {
-    debugger;
     const format = {};
     format.type = item.props.format.type;
     format.jumpPageJson = JSON.stringify(item.props.linkPage);
@@ -398,6 +400,9 @@ function getNameFromProp(prop) {
   }
   return prop;
 }
+function formatDynamicColumnData(item, temp) {
+  temp.dynamicColumnJson = JSON.stringify(item.props.dataOrigin.dynamicColumnJson);
+}
 export {
   querySublist,
   queryTableFields,

package/dist/es/components/design/views/assemblys/button/button/button-attr-advanced.vue.js

@@ -1,8 +1,9 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createTextVNode, createCommentVNode } from "vue";
-import _sfc_main$1 from "../component/condition-dialog.vue.js";
-import _sfc_main$2 from "../component/set-dialog.vue.js";
-import _sfc_main$3 from "../component/combination.vue.js";
+import _sfc_main$2 from "../component/condition-dialog.vue.js";
+import _sfc_main$3 from "../component/set-dialog.vue.js";
+import _sfc_main$4 from "../component/combination.vue.js";
 import JournalSetDialog from "../component/journal-set-dialog.vue.js";
+import _sfc_main$1 from "../../common/common-advanced-basic-showcondition.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "button-attr-advanced",
@@ -21,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const openCollapseItems = ref(["base"]);
-    const attributeMap = ref([
+    ref([
       {
         dbColumnName: "FIRST_TASK_ID",
         label: "该流程的第一个任务的id",
@@ -41,20 +42,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         value: "AUDIT_REPORT_NO"
       }
     ]);
-    const fieldMap = ref({
-      "FIRST_TASK_ID": {
+    ref({
+      FIRST_TASK_ID: {
         dbColumnName: "FIRST_TASK_ID",
         label: "该流程的第一个任务的id",
         type: "TEXT",
         value: "FIRST_TASK_ID"
       },
-      "ID": {
+      ID: {
         dbColumnName: "ID",
         label: "id",
         type: "LONG",
         value: "ID"
       },
-      "AUDIT_REPORT_NO": {
+      AUDIT_REPORT_NO: {
         dbColumnName: "AUDIT_REPORT_NO",
         label: "审核报告编号",
         type: "TEXT",
@@ -79,7 +80,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function saveSetting(setData) {
       props.configure.props.setValueList = setData;
-      console.log("%c描述-153236", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.setValueList);
+      console.log(
+        "%c描述-153236",
+        "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
+        props.configure.props.setValueList
+      );
     }
     const combinationVisible = ref(false);
     function closeCombinationDialog() {
@@ -190,6 +195,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
+                    createVNode(_component_el_form_item, {
+                      label: "启用条件",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(), createBlock(_sfc_main$1, {
+                          key: __props.configure.uuid + "_edit",
+                          configure: __props.configure,
+                          type: "editConditions"
+                        }, null, 8, ["configure"]))
+                      ]),
+                      _: 1
+                    }),
                     createVNode(_component_el_form_item, {
                       label: "自动设值",
                       class: "amb-design-attr-item"
@@ -245,24 +263,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              conditionVisible.value ? (openBlock(), createBlock(_sfc_main$1, {
+              conditionVisible.value ? (openBlock(), createBlock(_sfc_main$2, {
                 key: 0,
                 pageDesign: __props.pageDesign,
                 configure: __props.configure,
                 onClose: closeConditionDialog
               }, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
-              setVisible.value ? (openBlock(), createBlock(_sfc_main$2, {
+              setVisible.value ? (openBlock(), createBlock(_sfc_main$3, {
                 key: 1,
                 pageDesign: __props.pageDesign,
                 configure: __props.configure,
                 onSave: saveSetting,
                 onClose: closeSetDialog
               }, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
-              combinationVisible.value ? (openBlock(), createBlock(_sfc_main$3, {
+              combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 2,
                 conditionList: __props.configure.props.base.showCondition,
-                fieldNameList: attributeMap.value,
-                fieldMap: fieldMap.value,
+                fieldNameList: __props.pageDesign.modelFields,
+                fieldMap: __props.pageDesign.modelFieldsMap,
                 onSave: saveCondition,
                 onClose: closeCombinationDialog
               }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),