cloud-web-corejs 1.0.54-dev.781 → 1.0.54-dev.782

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

@@ -233,27 +233,42 @@ export const insertCustomCssToHead = function (cssCode, formId = "") {
   head.appendChild(newStyle);
 };
 
+/**
+ * 注入表单全局函数（formConfig.functions）：把代码执行在【真实全局作用域】，
+ * 使表单各类事件脚本能引用到其中定义的函数。
+ *
+ * 为什么不再插 <script>：事件脚本一律由 new Function 创建，其作用域链恒为真实全局作用域；
+ * 而 qiankun 沙箱 patch 了 head/body 的 appendChild，子应用里动态 script 不会进 DOM，
+ * 改由 execScripts 以 (function(window){with(window){...}}).bind(proxy) 包裹执行——
+ * `function foo(){}` 落在包裹函数的作用域里、`window.foo=` 落在 proxy 上，两者在真实
+ * window 上都不存在，调用侧必然 ReferenceError 且被各处 try/catch 吞掉（静默失效）。
+ *
+ * 间接 eval 由规范保证在全局作用域、非严格模式下求值，函数声明因此成为真实 window 的属性，
+ * 与 new Function 的取值环境对齐；qiankun 对 `eval` 有显式特判（proxySandbox 返回原生 eval），
+ * 主应用形态与子应用形态行为一致。
+ *
+ * 函数名与 formId 参数保持不变：调用方（含 haier 分支）沿用此签名，改名只增加同步面。
+ * 现已不产生 DOM 节点、无需按 id 清理，formId 仅用于 sourceURL 定位。
+ */
 export const insertGlobalFunctionsToHtml = function (
   functionsCode,
   formId = ""
 ) {
-  let bodyEle = document.getElementsByTagName("body")[0];
-  let oldScriptEle = document.getElementById("v_form_global_functions");
-  !!oldScriptEle && bodyEle.removeChild(oldScriptEle); //先清除后插入！！
-  if (!!formId) {
-    oldScriptEle = document.getElementById(
-      "v_form_global_functions" + "-" + formId
-    );
-    !!oldScriptEle && bodyEle.removeChild(oldScriptEle); //先清除后插入！！
+  if (!functionsCode || typeof functionsCode !== "string") {
+    return;
   }
-
-  let newScriptEle = document.createElement("script");
-  newScriptEle.id = !!formId
+  let sourceName = !!formId
     ? "v_form_global_functions" + "-" + formId
     : "v_form_global_functions";
-  newScriptEle.type = "text/javascript";
-  newScriptEle.innerHTML = functionsCode;
-  bodyEle.appendChild(newScriptEle);
+  try {
+    // (0, eval) 是间接调用形式，不可简写为 eval(...)：直接 eval 会继承当前模块作用域，
+    // 函数声明将落在模块内而非真实 window 上。sourceURL 让 devtools 里可定位、可下断点。
+    (0, eval)(functionsCode + "\n//# sourceURL=" + sourceName + ".js");
+  } catch (e) {
+    // 原先 <script> 注入时语法/运行时错误只进 window.onerror、不影响表单渲染，
+    // 这里必须同样吞掉：否则会中断 initFormObject 整条表单初始化链路
+    console.error("[xform] 表单全局函数执行失败：" + sourceName, e);
+  }
 };
 
 export const optionExists = function (optionsObj, optionName) {

package/src/microRouter/index.js

@@ -258,6 +258,9 @@ function activateMicroApp(key) {
       const loadingInstance = Loading.service({
         target: appMain || wrapper,
         text: "加载中…",
+        // 全局 .el-loading-spinner 的转圈伪元素是 position:fixed（按全屏遮罩写的），
+        // 局部遮罩下会跑到视口中心、与文字错位，靠这个类在样式里纠正（见 style.scss）
+        customClass: "micro-loading",
       });
       if (appMain && loadingInstance.$el && loadingInstance.$el.style) {
         loadingInstance.$el.style.top = wrapper.offsetTop + "px";

package/src/mixins/tableTree/index.js

@@ -1,4 +1,11 @@
 /**version-1.0*/
+import {
+  resolveTreeFields,
+  resolveTreeIdentityConfig,
+  treeKeyEquals,
+  isTemporaryTreeKey,
+} from "../../components/xform/utils/treeTableUtil";
+
 let mixins = {};
 mixins = {
   components: {},
@@ -39,6 +46,8 @@ mixins = {
       let that = this;
       let $grid = obj.$table.$xegrid;
       let originOption = $grid.originOption;
+      let treeContext = this.resolveTableTreeContext($grid);
+      let physicalIdField = treeContext.identityConfig.physicalIdField;
       let formData = commonDataUtil.handleForm(obj.row);
       that.$http({
         url: originOption.editSaveUrl || '',
@@ -50,7 +59,12 @@ mixins = {
             type: 'success',
             message: '保存成功!'
           });
-          if (obj.row.id == res.objx.id) {
+          if (
+            treeKeyEquals(
+              obj.row[physicalIdField],
+              res.objx[physicalIdField]
+            )
+          ) {
             $grid.clearActived().then(() => {
               Object.assign(obj.row, res.objx);
             });
@@ -62,17 +76,27 @@ mixins = {
         }
       })
     },
-    findAllRows(rows,grid) {
+    findAllRows(rows, grid, visited) {
       let newRows = [];
-      let childrenField = grid.treeConfig?.childrenField;
-      if (!childrenField) {
-        return rows;
-      }
+      let fields = this.resolveTableTreeContext(grid).fields;
+      let childrenFields = [
+        fields.childrenField,
+        fields.mapChildrenField,
+      ].filter((field, index, values) => field && values.indexOf(field) === index);
+      let seen = visited || new WeakSet();
       for (let i = 0; i < rows.length; i++) {
         let row = rows[i];
+        if (!row || typeof row !== "object" || seen.has(row)) {
+          continue;
+        }
+        seen.add(row);
         newRows.push(row);
-        if (row[childrenField]) {
-          let cRows = this.findAllRows(row[childrenField],grid);
+        for (let j = 0; j < childrenFields.length; j++) {
+          let children = row[childrenFields[j]];
+          if (!Array.isArray(children)) {
+            continue;
+          }
+          let cRows = this.findAllRows(children, grid, seen);
           if (cRows) {
             newRows = newRows.concat(cRows);
           }
@@ -90,7 +114,7 @@ mixins = {
         let rows = this.findAllRows(fullData,$grid);
         for (let i = 0; i < rows.length; i++) {
           let row = rows[i];
-          if (!this.hasSaveRow(row)) {
+          if (!this.hasSaveRow(row, $grid)) {
             return true;
           }
         }
@@ -98,7 +122,7 @@ mixins = {
         let rows = this.findAllRows(tableData,$grid);
         for (let i = 0; i < rows.length; i++) {
           let row = rows[i];
-          if (!this.hasSaveRow(row)) {
+          if (!this.hasSaveRow(row, $grid)) {
             return true;
           }
         }
@@ -186,12 +210,51 @@ mixins = {
         });
       });
     },
-    hasSaveRow(row) {
-      if (!row || !row.id || row.id.toString().indexOf("row_") == 0) {
+    resolveTableTreeContext($grid) {
+      let grid = $grid
+        || (typeof this.getGridTable === "function"
+          ? this.getGridTable()
+          : null);
+      let originOption = grid?.params?.originOption || grid?.originOption || {};
+      let treeConfig = this.resolvedTreeConfig
+        || grid?.treeConfig
+        || originOption.config?.treeConfig
+        || { rowField: "id" };
+      let fields = resolveTreeFields(treeConfig, { strict: false });
+      let identityConfig = this.resolvedTreeIdentityConfig
+        || originOption.treeIdentityConfig
+        || resolveTreeIdentityConfig(treeConfig, {});
+      return { fields, identityConfig };
+    },
+    hasSaveRow(row, $grid) {
+      if (!row) {
+        return false;
+      }
+      let treeContext = this.resolveTableTreeContext($grid);
+      let physicalIdField = treeContext.identityConfig.physicalIdField || "id";
+      let physicalId = row[physicalIdField];
+      if (physicalId == null || physicalId === "") {
+        return false;
+      }
+      if (
+        physicalIdField === treeContext.fields.rowField
+        && isTemporaryTreeKey(
+          row,
+          treeContext.fields.rowField,
+          treeContext.identityConfig
+        )
+      ) {
+        return false;
+      }
+      // 兼容仅写入 row_*、尚无显式 marker 的历史默认 id 新行。
+      if (
+        physicalIdField === "id"
+        && treeContext.fields.rowField === "id"
+        && physicalId.toString().indexOf("row_") === 0
+      ) {
         return false;
-      } else {
-        return true;
       }
+      return true;
     }
   }
 }