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

package/src/components/xform/utils/util.js

@@ -509,6 +509,13 @@ function handleWidgetForTraverse(
   }
 }
 
+/**
+ * 容器 → 子节点所在字段名。
+ *
+ * 注意：全库同一语义的映射有多份（designer.js 的局部表、indexMixin 的
+ * getTableFiledMap / getFormTemplateTableDTOs 两张局部表），改这里时请一并核对，
+ * 漏一份的后果参见 loopHandleWidgetItem 里关于 H5 容器的注释。
+ */
 export const itemFieldMap = {
   grid: "cols",
   table: "rows",
@@ -521,6 +528,7 @@ export const itemFieldMap = {
   "vf-box": "widgetList",
   card: "widgetList",
   detail: "panes",
+  "detail-plain": "panes", // 与 indexMixin 的两张表对齐，此前这张漏了
   "detail-pane": "widgetList",
   "detail-h5": "panes",
   "h5-card": "panes",
@@ -724,16 +732,22 @@ export function traverseWidgetsOfContainer(
     });
   } else if (con.category === "container") {
     //自定义容器
+    /* 容器类型不在 itemFieldMap 里时 key 是 undefined，con[undefined] 也是 undefined，
+       直接 .forEach 会抛 TypeError —— 表里没覆盖到的容器（list-h5、detail-tabs、
+       tree-pane…）都会中招，故取值后判空再遍历。 */
     let key = itemFieldMap[con.type];
-    con[key].forEach((cw) => {
-      handleContainerTraverse(
-        cw,
-        fieldHandler,
-        containerHandler,
-        internalContainerCallFlag,
-        staticWidgetsIncluded
-      );
-    });
+    let childList = key ? con[key] : null;
+    if (childList && childList.length > 0) {
+      childList.forEach((cw) => {
+        handleContainerTraverse(
+          cw,
+          fieldHandler,
+          containerHandler,
+          internalContainerCallFlag,
+          staticWidgetsIncluded
+        );
+      });
+    }
   }
 }
 
@@ -1554,6 +1568,16 @@ export function loopHandleWidget(widgetList, callback) {
     });
 }
 
+/* 子节点挂在 panes 上的容器（detail-h5 另有 widgetList 承载底部动作栏按钮） */
+const PANES_CONTAINER_TYPES = [
+  "detail",
+  "detail-plain",
+  "detail-h5",
+  "h5-card",
+];
+/* 内容在 widgetList、按钮在 buttonWidgetList 的分组容器 */
+const PANE_CONTAINER_TYPES = ["detail-pane", "h5-card-pane"];
+
 function loopHandleWidgetItem(e, p, callback) {
   if ("container" === e.category) {
     callback(e, p);
@@ -1575,6 +1599,18 @@ function loopHandleWidgetItem(e, p, callback) {
           loopHandleWidgetItem(childItem, e, callback);
         });
       }
+      /* 行按钮与顶部查询按钮，与 data-table 的 buttons 同一性质，
+         不遍历的话它们的 wf 联动与显隐规则同样不生效 */
+      if (!!e.lineButtons && e.lineButtons.length > 0) {
+        e.lineButtons.forEach((childItem) => {
+          loopHandleWidgetItem(childItem, e, callback);
+        });
+      }
+      if (!!e.buttons && e.buttons.length > 0) {
+        e.buttons.forEach((childItem) => {
+          loopHandleWidgetItem(childItem, e, callback);
+        });
+      }
     } else if ("grid" === e.type) {
       e.cols &&
         e.cols.length > 0 &&
@@ -1611,7 +1647,14 @@ function loopHandleWidgetItem(e, p, callback) {
               loopHandleWidgetItem(childItem, e, callback);
             });
         });
-    } else if ("detail" === e.type || "detail-plain" === e.type) {
+      /* 子节点放在 panes 里的容器。detail-h5 / h5-card 是 H5 版式的两个，
+         此前它们没有分支、落到最后的兜底 else，而兜底只遍历 widgetList ——
+         等于 H5 表单的字段和按钮一个都进不了 traverseAllWidgets* 的回调，
+         wf 联动(hiddenByWf/enabledByWf/wfEdit)、组件显隐规则等全部失效。
+         设计器侧的 designer.js 早有正确映射("detail-h5"/"h5-card" → panes)，
+         这里是运行时遍历器没跟上。
+         （detail-h5 的 widgetList 是底部动作栏按钮，也要一起遍历） */
+    } else if (PANES_CONTAINER_TYPES.indexOf(e.type) > -1) {
       if (e.panes) {
         e.panes.forEach(function (childItem) {
           loopHandleWidgetItem(childItem, e, callback);
@@ -1622,7 +1665,9 @@ function loopHandleWidgetItem(e, p, callback) {
           loopHandleWidgetItem(childItem, e, callback);
         });
       }
-    } else if ("detail-pane" === e.type) {
+      /* h5-card-pane 与 detail-pane 同构：内容在 widgetList、分组按钮在 buttonWidgetList。
+         兜底 else 只认 widgetList，会漏掉分组按钮（如自动骨架里的「新增」）。 */
+    } else if (PANE_CONTAINER_TYPES.indexOf(e.type) > -1) {
       if (e.widgetList) {
         e.widgetList.forEach(function (childItem) {
           loopHandleWidgetItem(childItem, e, callback);

package/src/index.js

@@ -12,7 +12,7 @@ import store from "@base/store";
 import router, { resetRouter } from "@base/router";
 import settings from "@/settings";
 import { setToken as setAuthToken } from "@base/utils/auth";
-import { loadViewComponent } from "@base/utils/resolveViewComponent";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
 
 import "@/icons"; // icon
 import "@base/permission"; // permission control
@@ -28,7 +28,12 @@ Vue.component("BaseKeepAlive", BaseKeepAlive);
 import VXETable from "vxe-table";
 import "vxe-table/lib/style.css";
 
-// 引入扩展插件
+// 区域选取/复制粘贴：自研实现，通过 window.VXETableMixin 挂载，
+// 必须在下面的 Vue.use(VXETable) 之前求值（core 在 install 时读取一次并 delete）
+import "@base/components/table/plugins/cell-area/index.js";
+import "@base/components/table/plugins/cell-area/index.scss";
+
+// 引入扩展插件（官方付费插件，已由上面的自研 cell-area 替代，保留仅作回退参考）
 // import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js";
 // import "@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css";
 
@@ -306,7 +311,7 @@ function render(props = {}) {
  *   仅 $baseReload / _handleCallback 覆盖为回主应用的动作。个别详情页若有更深的 $parent 依赖，
  *   按对接清单 §5.6 做最小改造。
  */
-function mountDetailHost(props = {}) {
+async function mountDetailHost(props = {}) {
   if (props.appCode) settings.appCode = props.appCode;
   if (props.token) {
     setAuthToken(props.token);
@@ -315,7 +320,7 @@ function mountDetailHost(props = {}) {
   if (props.lang) i18n.locale = props.lang;
 
   const appCode = props.appCode || settings.appCode;
-  const resolved = loadViewComponent(props.targetPath, { appCode });
+  const resolved = await loadViewComponentAsync(props.targetPath, { appCode });
   const target = resolved.component;
   const bizParams = props.bizParams || {};
   const viewMeta = props.viewMeta || {};

package/src/layout/components/Sidebar/default.vue

@@ -757,7 +757,7 @@ export default {
           let userInfo = res.objx;
           this.headPhotoUrl = userInfo.headPhotoUrl
             ? userInfo.headPhotoUrl
-            : require("@/resources/images" + "/default-header.png");
+            : (require("@/resources/images/default-header.png").default || require("@/resources/images/default-header.png"));
           this.userInfo = userInfo;
         },
       });

package/src/layout/components/extractedCode/viewDialog.vue

@@ -100,7 +100,7 @@ export default {
       this.$emit("update:visible", false);
       this.$emit("close");
     },
-    openWfDialog() {
+    async openWfDialog() {
       let obj = this.extractedRow?.obj;
       if (!obj) return;
       let objType = this.extractedRow.objType;
@@ -110,27 +110,27 @@ export default {
         readonly: true,
       };
 
-      let url;
+      let loadView;
       if (objType == "FormTemplate") {
-        url = "/bd/setting/form_template/edit.vue";
+        loadView = () => import("@base/views/bd/setting/form_template/edit.vue");
         wfDataId = obj.formCode;
         this.title = this.$t1("查看表单模板");
       } else if (objType == "FormScript") {
         if (obj.scriptType == 1) {
-          url = "/bd/setting/form_script/edit1.vue";
+          loadView = () => import("@base/views/bd/setting/form_script/edit1.vue");
         } else {
-          url = "/bd/setting/form_script/edit.vue";
+          loadView = () => import("@base/views/bd/setting/form_script/edit.vue");
         }
         this.title = this.$t1("查看表单脚本");
       } else if (objType == "TableTemplate") {
-        url = "/bd/setting/table_model/edit.vue";
+        loadView = () => import("@base/views/bd/setting/table_model/edit.vue");
         this.title = this.$t1("查看数据表定义模板");
       }
       this.param = Object.assign(param, {
         _dataId: wfDataId,
         extractedObj: obj,
       });
-      this.wfContent = require("@base/views" + url).default;
+      this.wfContent = loadView ? (await loadView()).default : null;
 
       this.showWfContent = true;
     },

package/src/router/index.js

@@ -1,5 +1,6 @@
 import Vue from "vue";
 import Router from "vue-router";
+import { Message } from "element-ui";
 
 Vue.use(Router);
 
@@ -19,6 +20,26 @@ const createRouter = () =>
 
 const router = createRouter();
 
+// 视图改按需加载后，路由跳转会真的去网络拉 chunk，于是多出一类以前不可能发生的失败：
+// 发版后旧标签页持有的 chunk 哈希已失效（404）、网络超时、或被网关截断（截断表现为
+// chunk 内 SyntaxError，不是网络错误）。vue-router 对这类失败是静默的——点了没反应。
+//
+// 菜单驱动的视图不走这里：store/modules/permission.js 的 loadView 自己 catch 后渲染
+// MenuFallback。这里兜的是 constantRoutes 里那批 () => import(...) 的静态路由。
+//
+// 只提示、不自动 reload：本系统表单页多，自动刷新会吞掉用户未保存的录入；而且一旦
+// 某个 chunk 持续拉不到（例如网关截断），自动刷新会退化成"用户每点一次就刷一次"的循环。
+router.onError((error) => {
+  const msg = (error && error.message) || "";
+  if (!/Loading (CSS )?chunk .* failed|ChunkLoadError/i.test(msg)) return;
+  console.error("[router] 页面资源加载失败：", error);
+  try {
+    Message.error("页面资源加载失败，请刷新页面后重试");
+  } catch (e) {
+    // Message 尚未可用时静默，至少 console 里留了痕迹
+  }
+});
+
 export function resetRouter() {
   const newRouter = createRouter();
   router.matcher = newRouter.matcher; // reset router

package/src/router/modules/customer.js

@@ -1,19 +1,76 @@
 export const constantRoutes = [
+  /*{
+    // 呼叫中心(CC)专用入口：只带 appid/appkey/account/callNo，
+    // 先换取 tp 再 replace 到 /form_outLinkView
+    path: "/cc_form_outLinkView",
+    component: () => import("@base/views/user/outLink/cc_form_view"),
+    meta: {
+      checkToken: false,
+    },
+    hidden: true,
+  },
   {
     path: "",
     component: () => import("@/layout/index"),
-    children: [
-      {
-        path: '/pmd/product/common/common_product_display/detail/:id',
-        component: () => import('@/views/pmd/product/common/common_product_display/detail'),
-        name: 'commonProductDisplayEdit',
-        meta: {
-          title: '产品详情',
-          paramField: 'id',
-          menuUrl: '/pmd/product/common/common_product_display/detail'
-        }
-      },
-    ]
-  }
+    children: [
+      {
+        path: "/basic/wf/wf_manage/list2",
+        component: () => import("@base/views/user/wf/wf_manage/list2"),
+        name: "wf_manage:list2",
+        meta: {
+          title: "流程待办",
+          icon: "dashboard",
+        },
+      },
+       {
+        // bizTab 示例 A：手写接口版（前端 mock，无流程，不吃后台前置条件）
+        path: "/demo/bizTab/simple",
+        component: () => import("@base/views/demo/bizTab/simple/list"),
+        name: "demoBizTabSimple",
+        meta: {
+          title: "bizTab 示例(手写接口)",
+          icon: "dashboard",
+        },
+      },
+      {
+        // bizTab 示例 B：formCode + 通用 bd_api（照 stdxx 的产品变更申请页）
+        path: "/demo/bizTab/bill",
+        component: () => import("@base/views/demo/bizTab/bill/list"),
+        name: "demoBizTabBill",
+        meta: {
+          title: "bizTab 示例(formCode+流程)",
+          icon: "dashboard",
+        },
+      },
+      {
+        // bizTab 示例 C：自定义控制器 + 流程（照 std / 本仓库 pmd/price/ladderPrice 页）
+        path: "/demo/bizTab/wf",
+        component: () => import("@base/views/demo/bizTab/wf/list"),
+        name: "demoBizTabWf",
+        meta: {
+          title: "bizTab 示例(自定义接口+流程)",
+          icon: "dashboard",
+        },
+      },
+      {
+        // bizTab 示例 D：独立模式（不在页签里，待办直开走的路径），复用示例 C 的详情
+        path: "/demo/bizTab/standalone",
+        component: () => import("@base/views/demo/bizTab/standalone/index.vue"),
+        name: "demoBizTabStandalone",
+        meta: {
+          title: "bizTab 示例(独立模式)",
+          icon: "dashboard",
+        },
+      },
+      {
+        path: "/support/form-dialog-demo",
+        component: () => import("@/views/support/form-dialog-demo/index.vue"),
+        name: "formDialogDemo",
+        meta: {
+          title: "formDialog 示例",
+          icon: "dashboard",
+        },
+      }, 
+    ],
+  },*/
 ];
-

package/src/store/modules/permission.js

@@ -15,6 +15,7 @@ import {
   registerSubApps,
   buildSubAppRoutes,
 } from "@base/microRouter";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
 import MenuFallback from "@base/views/user/menuFallback/index.vue";
 
 // qiankun 宿主态（仅 settings.microMainEnabled 的主应用登录后填充）
@@ -87,7 +88,7 @@ function buildUserInfoSnapshot(userState = {}) {
 
 let modules = {};
 
-// loadView 失败兜底：独立运行点到别家应用的菜单 / 菜单配置错误时展示提示页
+// loadView 失败兜底：独立运行点到别家应用的菜单 / 菜单配置错误 / 视图 chunk 加载失败时展示提示页
 function createFallbackComponent(view, error) {
   return {
     name: "menuLoadFallback",
@@ -108,25 +109,23 @@ let configUtl = {
   sidebarRoutes,
   Layout,
   getRouters,
+  // 委托 resolveViewComponent（全仓唯一的视图 import 落地点）。
+  //
+  // 这里原来写的是 AMD 异步形式 require([...], resolve, fail)，看着是懒加载，实则不是：
+  // webpack 的 AMDRequireDependenciesBlockParserPlugin 调 ContextDependencyHelpers.create
+  // 时不传 mode，默认落 mode:"sync"，且 root/regExp 与 resolveViewComponent 那条完全一致
+  // （ContextIdentifier 相同 = 同一个 ContextModule），于是整棵 views 照样焊进入口 chunk。
+  // 必须一并改掉，否则只改 resolveViewComponent 的结果是：app.js 变小，但首次点菜单时
+  // 下载一个十几 MB 的异步 chunk。
+  //
+  // 顺带干掉本文件这份重复的 @base/views 前缀嗅探——归属判断统一由 resolveViewPath 负责。
   loadView: function (view) {
     return (resolve) => {
-      const fail = (e) => resolve(createFallbackComponent(view, e));
-      try {
-        if (view) {
-          let t = "@base/views";
-          // let t2 = "@/components"
-          if (view.startsWith(t)) {
-            let path = view.substr(t.length);
-            return require(["../../views" + path], resolve, fail);
-          } /* else if (view.startsWith(t2)) {
-            let path = view.substr(t2.length);
-            return require(['@/components' + path], resolve, fail);
-          } */
-        }
-        return require(["@/views" + view], resolve, fail);
-      } catch (e) {
-        fail(e);
-      }
+      loadViewComponentAsync(view)
+        .then((res) =>
+          resolve(res.component || createFallbackComponent(view, res.error))
+        )
+        .catch((e) => resolve(createFallbackComponent(view, e)));
     };
   },
 };