cloud-web-corejs 1.1.0-dev.11 → 1.1.0-dev.13

package/src/components/xform/form-designer/form-widget/container-widget/h5-card-widget.vue

@@ -1,165 +1,165 @@
-<template>
-  <container-wrapper :designer="designer" :widget="widget" :parent-widget="parentWidget" :parent-list="parentList"
-                     :index-of-parent-list="indexOfParentList" :class="widget.options.isFullscreen ? 'full-height':''">
-    <div class="grid-container" :key="widget.id"
-         :class="{'selected': selected}" @click.stop="selectWidget(widget)">
-      <!-- 常驻选中把手（设计器专用）。h5卡片自己的可点区域会被它的卡片选项卡整块铺满
-           —— 拖入「H5详情」时默认就带三个（基础信息/明细信息/附件信息，见 designer.js
-           的 detail-h5 分支），一落地就点不中，只能「先选中里面的选项卡、再点返回上级」
-           才能打开它的属性面板，而增删/改名/排序选项卡都在那个面板里。
-           container-wrapper 的 drag-handler 帮不上忙：它只在**已经选中之后**才出现。
-           运行期走 h5-card-item，不含本文件，故只影响设计器画布。 -->
-      <div class="h5-card-handler" @click.stop="selectWidget(widget)">
-        {{ i18n2t(`designer.widgetLabel.${widget.type}`, `extension.widgetLabel.${widget.type}`) }}
-      </div>
-      <h5CardPaneWidget v-for="(paneWidget, index) in widget.panes" :key="index" :widget="paneWidget"
-                        :designer="designer" :parent-list="widget.panes"
-                        :index-of-parent-list="index" :parent-widget="widget"
-                        :col-height="widget.options.colHeight" tabRef="baseTabRef"
-                        :tabPaneGrade="2"></h5CardPaneWidget>
-
-    </div>
-  </container-wrapper>
-</template>
-<script>
-
-import h5CardPaneWidget from "../../../../../components/xform/form-designer/form-widget/container-widget/h5-card-pane-widget.vue";
-import ContainerWrapper from "../../../../../components/xform/form-designer/form-widget/container-widget/container-wrapper.vue";
-import i18n from "../../../../../components/xform/utils/i18n";
-import containerMixin from "../../../../../components/xform/form-designer/form-widget/container-widget/containerMixin";
-import refMixinDesign from "../../../../../components/xform/form-designer/refMixinDesign";
-
-export default {
-  name: "h5-card-widget",
-  componentName: 'ContainerWidget',
-  mixins: [i18n, containerMixin, refMixinDesign],
-  inject: ['refList'],
-  components: {ContainerWrapper, h5CardPaneWidget},
-  props: {
-    widget: Object,
-    parentWidget: Object,
-    parentList: Array,
-    indexOfParentList: Number,
-    designer: Object,
-  },
-  computed: {
-    selected() {
-      return this.widget.id === this.designer.selectedId
-    },
-
-    customClass() {
-      return this.widget.options.customClass || ''
-    },
-
-  },
-  watch: {
-    //
-  },
-  created() {
-    this.initRefList()
-  },
-  mounted() {
-    //
-  },
-  methods: {
-    checkContainerMove(evt) {
-      return true;
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.grid-container {
-  min-height: 50px;
-  //line-height: 48px;
-  /* 侧边与底部留一圈属于卡片自己的可点区域，和顶上的把手一起圈出它的边界 */
-  padding: 0 6px 6px;
-  outline: 1px dashed #336699;
-
-  > div {
-    height: 100%;
-  }
-
-  .form-widget-list {
-    // min-height: 28px;
-    height: 100%;
-  }
-
-}
-
-.grid-container.selected, .grid-cell.selected {
-  outline: 2px solid $--color-primary !important;
-}
-
-/* 把手条。★ 必须显式给高度：上面那条 `.grid-container > div{height:100%}` (0,1,1)
-   会把所有直接子元素拉满，本条 (0,2,0) 压得过。
-   负的左右外边距把它顶回容器的 6px 内边距之外，与虚线框贴齐。 */
-.grid-container > .h5-card-handler {
-  height: 20px;
-  line-height: 20px;
-  margin: 0 -6px 6px;
-  padding: 0 6px;
-  font-size: 12px;
-  color: $--color-primary;
-  background: transparentize($--color-primary, 0.88);
-  cursor: pointer;
-}
-
-.grid-container.selected > .h5-card-handler {
-  color: #fff;
-  background: $--color-primary;
-}
-
-.grid-cell {
-  min-height: 38px;
-  //margin: 6px 0;  /* 设置了margin，栅格列的offset、push、pull会失效！！ */
-  padding: 3px;
-  outline: 1px dashed #336699;
-  position: relative;
-
-  > div {
-    height: 100%;
-  }
-
-  .form-widget-list {
-    min-height: 50px;
-    height: 100%
-  }
-
-  .grid-col-action {
-    position: absolute;
-    bottom: 0;
-    right: -2px;
-    height: 28px;
-    line-height: 28px;
-    background: $--color-primary;
-    z-index: 999;
-
-    i {
-      font-size: 14px;
-      color: #fff;
-      margin: 0 5px;
-      cursor: pointer;
-    }
-  }
-
-  .grid-col-handler {
-    position: absolute;
-    top: -2px;
-    left: -2px;
-    height: 22px;
-    line-height: 22px;
-    background: $--color-primary;
-    z-index: 9;
-
-    i {
-      font-size: 14px;
-      font-style: normal;
-      color: #fff;
-      margin: 4px;
-      cursor: default;
-    }
-  }
-}
-
-</style>
+<template>
+  <container-wrapper :designer="designer" :widget="widget" :parent-widget="parentWidget" :parent-list="parentList"
+                     :index-of-parent-list="indexOfParentList" :class="widget.options.isFullscreen ? 'full-height':''">
+    <div class="grid-container" :key="widget.id"
+         :class="{'selected': selected}" @click.stop="selectWidget(widget)">
+      <!-- 常驻选中把手（设计器专用）。h5卡片自己的可点区域会被它的卡片选项卡整块铺满
+           —— 拖入「H5详情」时默认就带三个（基础信息/明细信息/附件信息，见 designer.js
+           的 detail-h5 分支），一落地就点不中，只能「先选中里面的选项卡、再点返回上级」
+           才能打开它的属性面板，而增删/改名/排序选项卡都在那个面板里。
+           container-wrapper 的 drag-handler 帮不上忙：它只在**已经选中之后**才出现。
+           运行期走 h5-card-item，不含本文件，故只影响设计器画布。 -->
+      <div class="h5-card-handler" @click.stop="selectWidget(widget)">
+        {{ i18n2t(`designer.widgetLabel.${widget.type}`, `extension.widgetLabel.${widget.type}`) }}
+      </div>
+      <h5CardPaneWidget v-for="(paneWidget, index) in widget.panes" :key="index" :widget="paneWidget"
+                        :designer="designer" :parent-list="widget.panes"
+                        :index-of-parent-list="index" :parent-widget="widget"
+                        :col-height="widget.options.colHeight" tabRef="baseTabRef"
+                        :tabPaneGrade="2"></h5CardPaneWidget>
+
+    </div>
+  </container-wrapper>
+</template>
+<script>
+
+import h5CardPaneWidget from "../../../../../components/xform/form-designer/form-widget/container-widget/h5-card-pane-widget.vue";
+import ContainerWrapper from "../../../../../components/xform/form-designer/form-widget/container-widget/container-wrapper.vue";
+import i18n from "../../../../../components/xform/utils/i18n";
+import containerMixin from "../../../../../components/xform/form-designer/form-widget/container-widget/containerMixin";
+import refMixinDesign from "../../../../../components/xform/form-designer/refMixinDesign";
+
+export default {
+  name: "h5-card-widget",
+  componentName: 'ContainerWidget',
+  mixins: [i18n, containerMixin, refMixinDesign],
+  inject: ['refList'],
+  components: {ContainerWrapper, h5CardPaneWidget},
+  props: {
+    widget: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+  },
+  computed: {
+    selected() {
+      return this.widget.id === this.designer.selectedId
+    },
+
+    customClass() {
+      return this.widget.options.customClass || ''
+    },
+
+  },
+  watch: {
+    //
+  },
+  created() {
+    this.initRefList()
+  },
+  mounted() {
+    //
+  },
+  methods: {
+    checkContainerMove(evt) {
+      return true;
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.grid-container {
+  min-height: 50px;
+  //line-height: 48px;
+  /* 侧边与底部留一圈属于卡片自己的可点区域，和顶上的把手一起圈出它的边界 */
+  padding: 0 6px 6px;
+  outline: 1px dashed #336699;
+
+  > div {
+    height: 100%;
+  }
+
+  .form-widget-list {
+    // min-height: 28px;
+    height: 100%;
+  }
+
+}
+
+.grid-container.selected, .grid-cell.selected {
+  outline: 2px solid $--color-primary !important;
+}
+
+/* 把手条。★ 必须显式给高度：上面那条 `.grid-container > div{height:100%}` (0,1,1)
+   会把所有直接子元素拉满，本条 (0,2,0) 压得过。
+   负的左右外边距把它顶回容器的 6px 内边距之外，与虚线框贴齐。 */
+.grid-container > .h5-card-handler {
+  height: 20px;
+  line-height: 20px;
+  margin: 0 -6px 6px;
+  padding: 0 6px;
+  font-size: 12px;
+  color: $--color-primary;
+  background: transparentize($--color-primary, 0.88);
+  cursor: pointer;
+}
+
+.grid-container.selected > .h5-card-handler {
+  color: #fff;
+  background: $--color-primary;
+}
+
+.grid-cell {
+  min-height: 38px;
+  //margin: 6px 0;  /* 设置了margin，栅格列的offset、push、pull会失效！！ */
+  padding: 3px;
+  outline: 1px dashed #336699;
+  position: relative;
+
+  > div {
+    height: 100%;
+  }
+
+  .form-widget-list {
+    min-height: 50px;
+    height: 100%
+  }
+
+  .grid-col-action {
+    position: absolute;
+    bottom: 0;
+    right: -2px;
+    height: 28px;
+    line-height: 28px;
+    background: $--color-primary;
+    z-index: 999;
+
+    i {
+      font-size: 14px;
+      color: #fff;
+      margin: 0 5px;
+      cursor: pointer;
+    }
+  }
+
+  .grid-col-handler {
+    position: absolute;
+    top: -2px;
+    left: -2px;
+    height: 22px;
+    line-height: 22px;
+    background: $--color-primary;
+    z-index: 9;
+
+    i {
+      font-size: 14px;
+      font-style: normal;
+      color: #fff;
+      margin: 4px;
+      cursor: default;
+    }
+  }
+}
+
+</style>

package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js

@@ -8,6 +8,14 @@ let XLSX = window.XLSX || { read, utils };
 import { getToken } from "../../../../../utils/auth";
 import XEUtils from "xe-utils";
 import { getErrorMsg } from "@base/utils/index.js";
+import {
+  getImportCellText,
+  getImportFileSizeLimit,
+  getImportRowLimit,
+  isImportFileOversize,
+  isImportRowsOverLimit,
+  toFileSizeMb,
+} from "../../../../../utils/importLimit";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
@@ -372,6 +380,25 @@ tmixins = {
       let that = this;
       let option = this.option;
 
+      // 业务侧的 importFileLimitSize 允许到 200MB，而这里是整文件 readAsBinaryString +
+      // XLSX.read 同步解析，占用约为文件体积的 5~20 倍 —— 那个量级必然把标签页撑爆，
+      // 且崩在库内部，连提示都给不出来。这里再收一道解析安全上限，可用
+      // importOption.maxFileSize 覆盖（0 表示不限制）。
+      if (isImportFileOversize(file, option)) {
+        this.$baseAlert(
+          this.$t1(
+            "导入文件过大（{size}MB），当前最多支持 {limit}MB，请拆分后分批导入",
+            {
+              size: toFileSizeMb(file.size),
+              limit: toFileSizeMb(getImportFileSizeLimit(option)),
+            }
+          )
+        );
+        // 与上游那道 importFileLimitSize 校验保持一致：只提示、不关弹窗，
+        // 用户可以直接重选一个小文件。
+        return false;
+      }
+
       if (option.importOption.multipleSheet) {
         this.readExcel2(file, callback);
         return;
@@ -403,6 +430,22 @@ tmixins = {
           let range = configUtil.XLSX.utils.decode_range(sheet["!ref"]);
           let dataSize = range.e.r + 1; //行数
           that.dataSize = dataSize - 3 >= 0 ? dataSize - 3 : 0;
+          // 行数闸门：下面逐格取值、建行对象、再整批发包全是同步的，行数失控时主线程会被
+          // 占死甚至 OOM。文件体积不大但行极多（窄表）时只有这一道能拦。
+          if (isImportRowsOverLimit(that.dataSize, option)) {
+            that.clearImportTimer();
+            that.$baseAlert(
+              that.$t1(
+                "导入数据 {size} 行，超过单次上限 {limit} 行，请拆分后分批导入",
+                {
+                  size: that.dataSize,
+                  limit: getImportRowLimit(option),
+                }
+              )
+            );
+            that.handleClose2();
+            return false;
+          }
           let titles = [];
           let fields = [];
 
@@ -428,7 +471,7 @@ tmixins = {
               if (typeof nextCell === "undefined") {
                 row.push(void 0);
               } else {
-                row.push(nextCell.w.trim());
+                row.push(getImportCellText(nextCell));
               }
             }
             if (rowNum === 1) {
@@ -1483,6 +1526,22 @@ tmixins = {
             let range = configUtil.XLSX.utils.decode_range(sheet["!ref"]);
             let dataSize = range.e.r + 1; //行数
             that.dataSize = dataSize - 3 >= 0 ? dataSize - 3 : 0;
+            // 行数闸门：下面逐格取值、建行对象、再整批发包全是同步的，行数失控时主线程会被
+            // 占死甚至 OOM。文件体积不大但行极多（窄表）时只有这一道能拦。
+            if (isImportRowsOverLimit(that.dataSize, option)) {
+              that.clearImportTimer();
+              that.$baseAlert(
+                that.$t1(
+                  "导入数据 {size} 行，超过单次上限 {limit} 行，请拆分后分批导入",
+                  {
+                    size: that.dataSize,
+                    limit: getImportRowLimit(option),
+                  }
+                )
+              );
+              that.handleClose2();
+              return false;
+            }
             let titles = [];
             let fields = [];
 
@@ -1508,7 +1567,7 @@ tmixins = {
                 if (typeof nextCell === "undefined") {
                   row.push(void 0);
                 } else {
-                  row.push(nextCell.w.trim());
+                  row.push(getImportCellText(nextCell));
                 }
               }
               if (rowNum === 1) {

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -109,6 +109,9 @@ export default {
         exportItemColumns: this.field.options.exportItemColumns || null,
         exportItemScriptCode: this.field.options.exportItemScriptCode || null,
         exportItemParam: this.field.options.exportItemParam || null,
+        // 字段勾选记忆按按钮分组存放，组件名是唯一且稳定的分组标识（见 exportColumnMemory.js）。
+        // 同一张表挂多个明细导出按钮时，各按钮的勾选互不覆盖。
+        exportButtonName: this.field.options.name || null,
       };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = { ...opt, ...tableExportParam, type: type };