super-page-designer 2.0.34 → 2.0.39

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

@@ -45,6 +45,62 @@ 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 tableOperateColumnConf = {
+  uuid: getUuidv4(),
+  name: "",
+  props: {
+    base: {
+      name: "操作",
+      title: "操作",
+      prop: "operation",
+      columnWidth: 150,
+      sortable: true,
+      visible: true,
+      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: ""
+  }
+};
 const assemblyGroups = [{
   name: "container",
   label: "容器",
@@ -188,14 +244,28 @@ const assemblyGroups = [{
         base: {
           tittleShow: true,
           title: "文本框",
-          clearable: true
+          clearable: true,
+          placeholder: "请输入"
         },
         linkPage: {},
         verification: {},
         scan: { ruleList: [] },
         preSuffix: {},
         prefix: {},
-        size: { widthType: "flex", flexSpan: 8 },
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        },
         title: {}
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
@@ -227,13 +297,27 @@ const assemblyGroups = [{
         base: {
           tittleShow: true,
           title: "选择器",
-          clearable: true
+          clearable: true,
+          placeholder: "请选择"
         },
         verification: {},
         dataOrigin: {
           displayQuantity: 20
         },
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -261,7 +345,20 @@ const assemblyGroups = [{
         dataOrigin: {
           displayQuantity: 20
         },
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -289,7 +386,20 @@ const assemblyGroups = [{
         dataOrigin: {
           displayQuantity: 20
         },
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -312,7 +422,8 @@ const assemblyGroups = [{
         base: {
           tittleShow: true,
           title: "文本域",
-          clearable: true
+          clearable: true,
+          placeholder: "请输入"
         },
         verification: {},
         size: { widthType: "flex", flexSpan: 24 }
@@ -342,10 +453,24 @@ const assemblyGroups = [{
           dateRangeDefaultValue: {},
           tittleShow: true,
           title: "日期",
-          clearable: true
+          clearable: true,
+          placeholder: "请选择"
         },
         verification: {},
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -386,9 +511,23 @@ const assemblyGroups = [{
       props: {
         base: {
           tittleShow: true,
-          title: "文件框"
+          title: "文件框",
+          placeholder: "请选择"
+        },
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
         },
-        size: { widthType: "flex", flexSpan: 8 },
         verification: {},
         uploadConfig: {}
       },
@@ -431,10 +570,28 @@ const assemblyGroups = [{
       name: "switch",
       label: "开关",
       icon: formSwitch,
-      props: { base: {
-        tittleShow: true,
-        title: "开关"
-      }, verification: {}, singleWidth: {}, size: { widthType: "flex", flexSpan: 8 } },
+      props: {
+        base: {
+          tittleShow: true,
+          title: "开关"
+        },
+        verification: {},
+        singleWidth: {},
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
+      },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
         { name: "change", label: "更改", tip: "更改" },
@@ -458,7 +615,20 @@ const assemblyGroups = [{
           title: "计数器"
         },
         verification: {},
-        size: { widthType: "flex", flexSpan: 8 },
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        },
         overallWidth: {},
         overallHeight: {}
       },
@@ -522,7 +692,20 @@ const assemblyGroups = [{
           tittleShow: true,
           title: "标签"
         },
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -555,9 +738,23 @@ const assemblyGroups = [{
       props: {
         base: {
           tittleShow: true,
-          title: "组织树"
+          title: "组织树",
+          placeholder: "请选择"
+        },
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
         },
-        size: { widthType: "flex", flexSpan: 8 },
         verification: {},
         title: {},
         orgFields: [{ type: "", model: "" }]
@@ -583,7 +780,8 @@ const assemblyGroups = [{
       props: {
         base: {
           tittleShow: false,
-          title: "富文本"
+          title: "富文本",
+          placeholder: "请输入"
         },
         verification: [],
         size: { fixedHeight: 200, widthType: "flex", flexSpan: 24 }
@@ -651,7 +849,20 @@ const assemblyGroups = [{
       props: {
         base: {},
         verification: {},
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -676,7 +887,20 @@ const assemblyGroups = [{
         },
         linkPage: {},
         prefix: {},
-        size: { widthType: "flex", flexSpan: 8 }
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        }
       },
       style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
       events: [
@@ -703,7 +927,20 @@ const assemblyGroups = [{
           tittleShow: true,
           title: "标签"
         },
-        size: { widthType: "flex", flexSpan: 8 },
+        size: {
+          pc: {
+            widthType: "flex",
+            flexSpan: 8
+          },
+          ipad: {
+            widthType: "flex",
+            flexSpan: 12
+          },
+          phone: {
+            widthType: "flex",
+            flexSpan: 24
+          }
+        },
         verification: {},
         formatting: {
           type: "",
@@ -940,63 +1177,7 @@ const assemblyGroups = [{
           tittleClass: ""
         }
       },
-      {
-        uuid: getUuidv4(),
-        name: "",
-        props: {
-          base: {
-            name: "操作",
-            title: "操作",
-            prop: "operation",
-            tittleShow: true,
-            columnWidth: 150,
-            visible: true,
-            sortable: true,
-            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: ""
-        }
-      }
+      tableOperateColumnConf
     ],
     modelFields: [],
     props: {
@@ -1928,6 +2109,11 @@ const assemblyGroups = [{
   label: "统计图",
   icon: groupChart,
   events: [{ name: "afterChartFormLoad", label: "加载图表查询表单后", tip: "加载图表查询表单后" }],
+  design: {
+    style: {
+      "height": "100%"
+    }
+  },
   items: [{
     name: "chart-column-line",
     label: "柱/折图",
@@ -1937,7 +2123,9 @@ const assemblyGroups = [{
         "margin-bottom": "18px"
       }
     },
-    props: { size: { fixHeight: 300, widthType: "flex", flexSpan: 24 } },
+    props: {
+      size: { fixHeight: 300, widthType: "flex", flexSpan: 24 }
+    },
     style: { yaxisLeft: {}, yaxisRight: {} },
     designComponent: defineAsyncComponent(() => {
       return import("../views/assemblys/chart/column-line/column-line-design.vue.js");
@@ -1951,10 +2139,29 @@ const assemblyGroups = [{
     icon: chartPie,
     design: {
       style: {
-        "margin-bottom": "18px"
+        "margin-bottom": "18px",
+        "height": "100%"
+      }
+    },
+    props: {
+      size: {
+        pc: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        ipad: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        phone: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 24
+        }
       }
     },
-    props: { size: { fixHeight: 300, widthType: "flex", flexSpan: 12 } },
     style: {},
     designComponent: defineAsyncComponent(() => {
       return import("../views/assemblys/chart/pie/pie-design.vue.js");
@@ -1966,7 +2173,31 @@ const assemblyGroups = [{
     name: "chart-gauge",
     label: "仪表盘",
     icon: chartGauge,
-    props: { size: { fixHeight: 300, widthType: "flex", flexSpan: 12 } },
+    design: {
+      style: {
+        "margin-bottom": "18px",
+        "height": "100%"
+      }
+    },
+    props: {
+      size: {
+        pc: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        ipad: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        phone: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 24
+        }
+      }
+    },
     style: {},
     designComponent: defineAsyncComponent(() => {
       return import("../views/assemblys/chart/gauge/gauge-design.vue.js");
@@ -1978,7 +2209,31 @@ const assemblyGroups = [{
     name: "chart-radar",
     label: "雷达图",
     icon: chartRader,
-    props: { size: { fixHeight: 300, widthType: "flex", flexSpan: 12 } },
+    design: {
+      style: {
+        "margin-bottom": "18px",
+        "height": "100%"
+      }
+    },
+    props: {
+      size: {
+        pc: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        ipad: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        phone: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 24
+        }
+      }
+    },
     style: {},
     designComponent: defineAsyncComponent(() => {
       return import("../views/assemblys/chart/radar/radar-design.vue.js");
@@ -1990,7 +2245,31 @@ const assemblyGroups = [{
     name: "chart-scatter",
     label: "散点图",
     icon: chartScatter,
-    props: { size: { fixHeight: 300, widthType: "flex", flexSpan: 12 } },
+    design: {
+      style: {
+        "margin-bottom": "18px",
+        "height": "100%"
+      }
+    },
+    props: {
+      size: {
+        pc: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        ipad: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 12
+        },
+        phone: {
+          fixHeight: 300,
+          widthType: "flex",
+          flexSpan: 24
+        }
+      }
+    },
     style: { yaxisLeft: {}, yaxisRight: {} },
     designComponent: defineAsyncComponent(() => {
       return import("../views/assemblys/chart/scatter/scatter-design.vue.js");
@@ -2063,7 +2342,12 @@ const pageConf = {
     // 判重组合字段
     judgeHeavyList: []
   },
-  style: {},
+  style: {
+    paddingTop: 10,
+    paddingRight: 10,
+    paddingBottom: 10,
+    paddingLeft: 10
+  },
   events: [
     {
       // 页面布局等加载后，但数据加载前时
@@ -2077,7 +2361,7 @@ const pageConf = {
     },
     {
       name: "onUnmounted",
-      label: ""
+      label: "页面卸载时"
     }
   ]
 };
@@ -2088,6 +2372,11 @@ function getPageConf() {
   tempConf.label = "页面";
   return tempConf;
 }
+function getTableOperateConf() {
+  const conf = deepCopy(tableOperateColumnConf);
+  conf.uuid = getUuidv4();
+  return conf;
+}
 const standardButtonOperations = [
   {
     label: "表单标准功能",
@@ -2320,5 +2609,6 @@ export {
   getDesignConfByName,
   getFormComponentOptions,
   getPageConf,
+  getTableOperateConf,
   standardButtonOperations
 };

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

@@ -3,14 +3,11 @@ function caculatePageStyle(configure, designStyle, designClass) {
   let tempClass = "";
   const pageInfo = configure;
   if (pageInfo.props.isFlex) {
-    tempClass += "el-row";
-    if (!isNaN(pageInfo.props.flexGutter)) {
-      const num = parseInt(pageInfo.props.flexGutter) / 2;
-      tempStyle["margin-left"] = "-" + num + "px";
-      tempStyle["margin-right"] = "-" + num + "px";
-    }
+    tempStyle.display = "flex";
+    tempStyle["flex-wrap"] = "wrap";
+    tempStyle["align-content"] = "flex-start";
     if (pageInfo.props.flexJustify) {
-      tempClass += " is-justify-" + pageInfo.props.flexJustify;
+      tempStyle["justify-content"] = pageInfo.props.flexJustify;
     }
   }
   const defineStyle = pageInfo.style ? pageInfo.style : {};
@@ -77,6 +74,7 @@ function caculateCommonStyle(configure, designStyle, designClass) {
     } else {
       if (tempSizeConf.flexSpan) {
         dimensionsClass += " el-col-" + tempSizeConf.flexSpan;
+        dimensionsStyle["flexSpan"] = tempSizeConf.flexSpan;
       }
     }
     if (tempSizeConf.fixHeight) {
@@ -162,7 +160,7 @@ function caculateComponentStyle(configure, designStyle, designClass, designHeade
     tempStyle["padding-left"] = defineStyle.paddingLeft + "px";
   }
   if (defineStyle.borderWidth && defineStyle.borderColor) {
-    tempStyle["border"] = defineStyle.borderWidth + "px " + (defineStyle.borderType ? defineStyle.borderType : "solid") + " " + defineStyle.borderColor;
+    tempStyle["border"] = defineStyle.borderWidth + "px " + (defineStyle.borderType ? defineStyle.borderType : "solid") + " " + defineStyle.borderColor + " !important";
     if (defineStyle.radius) {
       tempStyle["border-radius"] = defineStyle.radius + "px";
     }

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

@@ -42,8 +42,9 @@ export interface Component extends Object {
  * 页面对象
  */
 export interface PageDesign extends Component {
-    systemCode: string;
-    systemVersion: number;
+    systemCode?: string;
+    systemVersion?: number;
+    backendUrl?: string;
     code: string;
     dimensions?: string;
     tableSysCode?: string;