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

package/src/components/wf/wf.js

@@ -2,17 +2,18 @@
 import {getToken} from "../../utils/auth";
 import settingConfig from "@/settings.js";
 import {selectDialogMixins} from "../../mixins/selectDialog";
-import {requireViewCompat} from "@base/utils/resolveViewComponent";
+import {requireViewAsync} from "@base/utils/resolveViewComponent";
 import {getWfButtonNames, loadWfButtonNames} from "./wfButtonName";
 import {isWfAutoConfirm, loadWfAutoConfirm} from "./wfAutoConfirm";
 
 let configUtil = {
   baseUrl: process.env.VUE_APP_BASE_API,
   getToken,
-  // 归属自己 / 包内组件本地渲染；归属别家子应用（remote）或缺文件时返回 null，
-  // 不再抛错崩溃。归属解析见 @base/utils/resolveViewComponent。
+  // 归属自己 / 包内组件本地渲染；归属别家子应用（remote）、缺文件或 chunk 加载失败时
+  // 解析为 null，不抛错崩溃。返回 Promise，调用方必须 await。
+  // 归属解析见 @base/utils/resolveViewComponent。
   requireView: (url) => {
-    return requireViewCompat(url);
+    return requireViewAsync(url);
   },
 };
 
@@ -198,11 +199,12 @@ wfIndexMixin = {
         modalStrictly: true,
       });
     },
-    openWfModifyDialog() {
+    async openWfModifyDialog() {
       let row = this.paramData;
       let url = row.url + ".vue";
       this.showModifyDialog = true;
-      this.content = configUtil.requireView(url);
+      // await 之后再 $openEditView：它是 200ms 定时放行，冷启动拉 chunk 常超过它
+      this.content = await configUtil.requireView(url);
       this.$openEditView("showBillEdit");
     },
     modfyDialogClose() {
@@ -828,8 +830,23 @@ wfContentMixin = {
         },
       });
     },
+    /**
+     * 提醒只是主流程前面的一道增强，不能让它把主流程带崩或卡死：
+     * - 放行只允许一次（go 自带闸门），成功/异常各分支共用一个出口；
+     * - 确认框点取消 = 放弃本次操作，什么都不做，但 MessageBox 的 reject 必须吃掉，
+     *   否则是一条 unhandled rejection；
+     * - error 分支绝不能抛异常。request.js 是先调 config.error(e) 再 removeModel(config)，
+     *   这里一抛，isLoading 的全屏遮罩就永远关不掉、整页被锁死。而网络失败/超时时
+     *   e.response 本就是 undefined，老写法 e.response.status 必崩 —— 故 status 取值判空。
+     */
     handleReminderContent(scriptType, callback){
       let that = getTarget(this);
+      let called = false;
+      const go = () => {
+        if (called) return
+        called = true;
+        callback && callback();
+      };
       that.$http({
           url: this.current_prefix + "/wf/getReminderContent",
           data: {
@@ -841,23 +858,25 @@ wfContentMixin = {
           isLoading: true,
           errorMsg: false,
           success: (res) => {
-            if(res.objx){
-              that.$baseConfirm(res.objx).then(() => {
-                callback && callback();
-              });
+            if(res && res.objx){
+              that.$baseConfirm(res.objx).then(go).catch(() => {});
             }else{
-              callback && callback();
+              go();
             }
           },
           error: (e) => {
-            if(e.response.status === 404){
-              callback && callback();
-            }else{
-              that.$errorMsg({
-                content: e.message,
-                type: 'error',
-              });
+            let status = e && e.response ? e.response.status : null;
+            if(status === 404){
+              // 后端没部署这个接口，等同于「没有提醒」，静默放行
+              go();
+              return
             }
+            /* 其余错误只提示不放行：提醒内容可能是必须让人看到的业务警告，
+               接口挂了就悄悄跳过等于把它吞掉。用户重试即可。 */
+            that.$errorMsg({
+              content: (e && e.message) || this.$t2('获取提醒内容失败', 'components.wf.reminderError'),
+              type: 'error',
+            }).catch(() => {});
           },
       });
     },
@@ -1983,11 +2002,12 @@ wfModifyMixin = {
     this.openWfModifyDialog(this.code);
   },
   methods: {
-    openWfModifyDialog() {
+    async openWfModifyDialog() {
       let row = this.paramData;
       let url = row.url + ".vue";
       this.showModifyDialog = true;
-      this.content = configUtil.requireView(url);
+      // await 之后再 $openEditView：它是 200ms 定时放行，冷启动拉 chunk 常超过它
+      this.content = await configUtil.requireView(url);
       this.$openEditView("showBillEdit");
     },
     modfyDialogClose() {

package/src/components/wf/wfActionDropdown.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wf-action-dropdown-wrap button-sty" v-show="items.length">
-    <!-- 通过 / 驳回 / 撤回 挪出下拉，在标题栏直接平铺；其余操作仍收在「更多」下拉里 -->
+    <!-- 通过 / 中断 / 驳回 挪出下拉，在标题栏直接平铺；其余操作（含撤回）仍收在「更多」下拉里 -->
     <el-button
       v-for="item in standaloneItems"
       :key="item.key"

package/src/components/wf/wfActionItems.js

@@ -10,7 +10,7 @@
 
 /* 详情标题栏里不收进下拉、直接平铺成独立按钮的操作。
    顺序按 getWfActionItems 的定义序，不按这里的书写序。 */
-export const HEADER_STANDALONE_KEYS = ["agree", "reject", "revoke"];
+export const HEADER_STANDALONE_KEYS = ["agree", "manual", "reject"];
 
 export function getWfActionItems(vm) {
   let wfInfo = (vm && vm.wfInfo) || {};

package/src/components/xform/form-designer/designer.js

@@ -148,12 +148,17 @@ let chartContainers = [],
 
       clearDesigner(skipHistoryChange) {
         let emptyWidgetListFlag = this.widgetList.length === 0;
+        /* 版式是"当前在设计哪一端"，不是表单内容的一部分。defaultFormConfig 里没有
+           layoutType，overwriteObj 之后 getLayoutType() 会退回 "PC" —— 在 H5 模板里
+           点一下「清空」，左侧面板就跳回 PC 组件列表了。先存后还。 */
+        let keepLayoutType = this.getLayoutType();
         this.widgetList = [];
         this.selectedId = null;
         this.selectedWidgetName = null;
         this.selectedWidget = {}; //this.selectedWidget = null
         baseRefUtil.overwriteObj(this.formConfig, defaultFormConfig); //
         this.formConfig.gridConfig = defaultFormConfig.gridConfig;
+        this.formConfig.layoutType = keepLayoutType;
 
         if (!!skipHistoryChange) {
           //什么也不做！！
@@ -1543,57 +1548,35 @@ let chartContainers = [],
           newCol.options.label = "基本信息";
           newCon.panes.push(newCol);
         } else if (newCon.type === "detail-h5") {
-          /*let newTab = this.copyNewContainerWidget(this.getContainerByType('tab'));
-          newCon.panes.push(newTab)
-
-          newTab.options.tabClass = "tab-box";
-          let newTabPane = newTab.tabs[0];
-          newTabPane.options.label = '基本信息';*/
-
-          //基本信息
+          // 一张 h5-card：基础信息 / 明细信息 / 附件信息
           let newCard = this.copyNewContainerWidget(
             this.getContainerByType("h5-card")
           );
-          // newTabPane.widgetList.push(newCard);
           newCon.panes.push(newCard);
 
-          //明细信息
+          // 基础信息：默认放 h5 表格（一行两列），对齐 PC 详情的「基础信息 + 表格」
+          let basicPane = newCard.panes[0];
+          if (basicPane) {
+            basicPane.options.label = "基础信息";
+            let h5Table = this.copyNewContainerWidget(
+              this.getContainerByType("h5-table")
+            );
+            basicPane.widgetList.push(h5Table);
+          }
+
+          // 明细信息：H5 列表；只读阶段不预置新增/查看按钮（点行仍可进详情）
           let newCardPane = this.copyNewContainerWidget(
             this.getContainerByType("h5-card-pane")
           );
           newCardPane.options.label = "明细信息";
           newCard.panes.push(newCardPane);
 
-          //列表
           let listH5 = this.copyNewContainerWidget(
             this.getContainerByType("list-h5")
-          ); //vabUpload
-          newCardPane.widgetList.push(listH5);
-
-          //列表新增按钮
-          let buttonCon = this.copyNewFieldWidget(
-            this.getFieldWidgetByType("button")
-          );
-          buttonCon.options.label = "新增";
-          buttonCon.options.icon = "el-icon-search";
-          buttonCon.options.onClick =
-            "this.getWidgetRef('" + listH5.options.name + "').addTableData();";
-          newCardPane.buttonWidgetList.push(buttonCon);
-
-          //列表行查看按钮
-          buttonCon = this.copyNewFieldWidget(
-            this.getFieldWidgetByType("button")
           );
-          buttonCon.options.rowFlag = true;
-          buttonCon.options.label = "查看";
-          buttonCon.options.icon = "el-icon-edit";
-          buttonCon.options.onClick =
-            "this.getWidgetRef('" +
-            listH5.options.name +
-            "').openRowDetailDialog(row);";
-          listH5.lineButtons.push(buttonCon);
+          newCardPane.widgetList.push(listH5);
 
-          //附件信息
+          // 附件信息
           newCardPane = this.copyNewContainerWidget(
             this.getContainerByType("h5-card-pane")
           );
@@ -1602,30 +1585,31 @@ let chartContainers = [],
 
           let vabUploadCon = this.copyNewFieldWidget(
             this.getFieldWidgetByType("vabUpload")
-          ); //vabUpload
+          );
           newCardPane.widgetList.push(vabUploadCon);
         } else if (newCon.type === "h5-table") {
-          for (let i = 0; i < 4; i++) {
+          /* 默认 4 行 × 2 列，对齐 H5「一行两个」的紧凑版式。
+             不再预置 input：H5 面板已下架单行输入，空单元格由设计者拖入字段。 */
+          const h5TableCols = 2;
+          const h5TableRows = 4;
+          for (let i = 0; i < h5TableRows; i++) {
             let newRow = {
               cols: [],
             };
             newRow.id = "table-row-" + baseRefUtil.generateId();
             newRow.merged = false;
 
-            let newCell = baseRefUtil.deepClone(
-              this.getContainerByType("h5-table-cell")
-            );
-            newCell.id = "table-cell-" + baseRefUtil.generateId();
-            newCell.options.name = newCell.id;
-            newCell.merged = false;
-            newCell.options.colspan = 1;
-            newCell.options.rowspan = 1;
-            newRow.cols.push(newCell);
-
-            let newInput = this.copyNewFieldWidget(
-              this.getFieldWidgetByType("input")
-            );
-            newCell.widgetList.push(newInput);
+            for (let j = 0; j < h5TableCols; j++) {
+              let newCell = baseRefUtil.deepClone(
+                this.getContainerByType("h5-table-cell")
+              );
+              newCell.id = "table-cell-" + baseRefUtil.generateId();
+              newCell.options.name = newCell.id;
+              newCell.merged = false;
+              newCell.options.colspan = 1;
+              newCell.options.rowspan = 1;
+              newRow.cols.push(newCell);
+            }
 
             newCon.rows.push(newRow);
           }
@@ -1770,6 +1754,21 @@ let chartContainers = [],
         newGridCol.id = "detail-pane-" + tmpId;
         newGridCol.options.name = "detailPane" + tmpId;
         newGridCol.options.label = "detailPane" + tmpId;
+        // 默认添加一个栅格控件到新 pane 的 widgetList 中，含3列平均分布
+        let defaultGrid = baseRefUtil.deepClone(
+          this.getContainerByType("grid")
+        );
+        defaultGrid.id = "grid-" + baseRefUtil.generateId();
+        // 添加3列，每列 span=8（24栏栅格均分）
+        for (let i = 0; i < 3; i++) {
+          let col = baseRefUtil.deepClone(
+            this.getContainerByType("grid-col")
+          );
+          col.id = "grid-col-" + baseRefUtil.generateId();
+          col.options.span = 8;
+          defaultGrid.cols.push(col);
+        }
+        newGridCol.widgetList.push(defaultGrid);
         gridWidget.panes.push(newGridCol);
       },