eoss 0.1.0-alpha.37 → 0.1.0-alpha.39

package/lib/wujie.js

@@ -3549,7 +3549,7 @@ __webpack_require__.d(__webpack_exports__, "preloadApp", function() { return /*
 __webpack_require__.d(__webpack_exports__, "destroyApp", function() { return /* reexport */ destroyApp; });
 __webpack_require__.d(__webpack_exports__, "refreshApp", function() { return /* reexport */ refreshApp; });
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wujie/src/wujie.vue?vue&type=template&id=3fa66ad9&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wujie/src/wujie.vue?vue&type=template&id=416c748e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3601,7 +3601,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/wujie/src/wujie.vue?vue&type=template&id=3fa66ad9&
+// CONCATENATED MODULE: ./packages/wujie/src/wujie.vue?vue&type=template&id=416c748e&
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(2);
@@ -3769,7 +3769,9 @@ var bus = external_wujie_vue2_default.a.bus,
 
   watch: {
     /**
-     * 监听 keys 变化，重建子应用实现刷新
+     * 监听 keys 变化，重建子应用实现刷新（点菜单/刷新按钮的统一通道）；
+     * url 变化不单独触发重建：换地址场景（如 fourthTabs）由调用方同时更新 keys，
+     * 避免 url+keys 同变时重建两次
      */
     keys: function keys() {
       this.refresh();
@@ -3782,6 +3784,10 @@ var bus = external_wujie_vue2_default.a.bus,
       bus.$off(this.name);
     }
     this._clearTimer();
+    // 保活模式下沙箱不随组件卸载回收，页签关闭时主动销毁，避免沙箱常驻内存
+    if (this.alive) {
+      this.destroy();
+    }
   },
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss",
-  "version": "0.1.0-alpha.37",
+  "version": "0.1.0-alpha.39",
   "description": "eoss内部业务组件",
   "main": "lib/eoss.common.js",
   "files": [

package/packages/account-login/src/account-login.vue

@@ -104,13 +104,7 @@
 </template>
 
 <script>
-import {
-  queryParams,
-  encode,
-  decode,
-  loading,
-  error
-} from 'eoss/src/utils/util';
+import { queryParams, encode, decode, loading } from 'eoss/src/utils/util';
 import { getStorage } from 'eoss/src/utils/storage';
 import { changeImg } from 'eoss/src/config/api';
 import { ajax } from 'eoss/src/utils/ajax';
@@ -119,6 +113,8 @@ import EsCheckbox from 'eoss/packages/checkbox';
 import EsForm from 'eoss/packages/form';
 import EsFormItem from 'eoss/packages/form-item';
 import EsInput from 'eoss/packages/input';
+import Message from 'eoss/packages/message';
+
 export default {
   name: 'EsAccountLogin',
   components: { EsButton, EsCheckbox, EsForm, EsFormItem, EsInput },
@@ -385,10 +381,9 @@ export default {
                   if (rCode === 0) {
                     const { statusCode, msg } = results;
                     if (statusCode === 1) {
-                      error(msg || '登录失败！', () => {
-                        this.$emit('error', res);
-                        this.resetCode();
-                      });
+                      Message.error(msg || '登录失败！');
+                      this.$emit('error', res);
+                      this.resetCode();
                     } else {
                       if (this.checked) {
                         this.$set(
@@ -404,10 +399,9 @@ export default {
                       this.$emit('success', results);
                     }
                   } else {
-                    error(res.msg || '登录失败！', () => {
-                      this.$emit('error', res);
-                      this.resetCode();
-                    });
+                    Message.error(res.msg || '登录失败！');
+                    this.$emit('error', res);
+                    this.resetCode();
                   }
                   loadingInstance.close();
                 })

package/packages/ca-login/src/ca-login.vue

@@ -24,6 +24,7 @@
 
 <script>
 import MessageBox from 'eoss/packages/message-box';
+import Message from 'eoss/packages/message';
 import EsButton from 'eoss/packages/button';
 import {
   uuid,
@@ -493,18 +494,16 @@ export default {
           if (res.rCode == 0) {
             const { statusCode, msg } = results;
             if (statusCode === 1) {
-              error(msg || '登录失败！', () => {
-                this.$emit('error', res);
-              });
+              Message.error(msg || '登录失败！');
+              this.$emit('error', res);
             } else {
               this.$emit('success', results);
             }
           } else {
             const msg =
               res.results && res.results.msg ? res.results.msg : res.msg;
-            error(msg || '系统错误，请联系管理员！', () => {
-              this.$emit('error', res);
-            });
+            Message.error(msg || '系统错误，请联系管理员！');
+            this.$emit('error', res);
           }
           loadingInstance.close();
         })

package/packages/data-table/src/data-table.vue

@@ -312,9 +312,7 @@ export default {
             this.$set(this.pages, 'total', results.totalCount);
             this.datas = results.records || results.data || [];
           })
-          .catch((res) => {
-            error(res.message || '数据获取失败');
-          });
+          .catch(() => {});
       }
       return this.datas;
     },

package/packages/email-login/src/email-login.vue

@@ -66,12 +66,13 @@
 <script>
 import { getLoginCode } from 'eoss/src/config/api';
 import { ajax } from 'eoss/src/utils/ajax';
-import { success, error, loading } from 'eoss/src/utils/util';
+import { loading } from 'eoss/src/utils/util';
 
 import EsButton from 'eoss/packages/button';
 import EsForm from 'eoss/packages/form';
 import EsFormItem from 'eoss/packages/form-item';
 import EsInput from 'eoss/packages/input';
+import Message from 'eoss/packages/message';
 /**
  * 邮箱验证码登录组件
  * 功能说明：提供邮箱验证码登录功能，包括邮箱输入、验证码获取和登录提交
@@ -221,9 +222,9 @@ export default {
               .then((res) => {
                 const { rCode, msg } = res;
                 if (rCode === 0) {
-                  this.$message.success(msg || '验证码已发送！');
+                  Message.success(msg || '验证码已发送！');
                 } else {
-                  this.$message({
+                  Message({
                     message: res.msg || '验证码获取失败！',
                     type: 'error',
                     onClose: () => {
@@ -273,18 +274,16 @@ export default {
                   if (rCode === 0) {
                     const { statusCode, msg } = results;
                     if (statusCode === 1) {
-                      error(msg || '登录失败！', () => {
-                        this.$emit('error', res);
-                        this.resetCode();
-                      });
+                      Message.error(msg || '登录失败！');
+                      this.$emit('error', res);
+                      this.resetCode();
                     } else {
                       this.$emit('success', results);
                     }
                   } else {
-                    error(res.msg || '登录失败！', () => {
-                      this.$emit('error', res);
-                      this.resetCode();
-                    });
+                    Message.error(res.msg || '登录失败！');
+                    this.$emit('error', res);
+                    this.resetCode();
                   }
                 })
                 .catch(() => {

package/packages/flow/src/form.vue

@@ -48,11 +48,11 @@
 <script>
 import { addCommonOpion, editCommonOpion } from 'eoss/src/config/api';
 import { ajax } from 'eoss/src/utils/ajax';
-import { error } from 'eoss/src/utils/util';
 import EsButton from 'eoss/packages/button';
 import EsForm from 'eoss/packages/form';
 import EsFormItem from 'eoss/packages/form-item';
 import EsInput from 'eoss/packages/input';
+import Message from 'eoss/packages/message';
 export default {
   name: 'ideas',
   componentName: 'ideas',
@@ -111,7 +111,7 @@ export default {
           if (status == 'success') {
             this.newData = data.bean;
           } else {
-            error(message || '系统错误，请联系管理员！');
+            Message.error(message || '系统错误，请联系管理员！');
           }
           this.loading = false;
         })

package/packages/login/src/download.vue

@@ -28,7 +28,7 @@
   </div>
 </template>
 <script>
-import { error } from 'eoss/src/utils/util';
+import Message from 'eoss/packages/message';
 import EsIcon from 'eoss/packages/icon';
 import EsQrCode from 'eoss/packages/qr-code';
 export default {
@@ -75,7 +75,7 @@ export default {
       if (url) {
         window.open(url);
       } else {
-        error('下载地址不存在！');
+        Message.error('下载地址不存在！');
         return;
       }
     }

package/packages/login/src/login.vue

@@ -227,9 +227,7 @@ import {
   setFavicon,
   delUrlParam,
   urlJoinParams,
-  success,
-  warning,
-  error
+  warning
 } from 'eoss/src/utils/util';
 import { isObject } from 'eoss/src/utils/types';
 import { ajax } from 'eoss/src/utils/ajax';
@@ -246,6 +244,7 @@ import {
   getTwoFactorLoginCode,
   doAssistanceQrLogin
 } from 'eoss/src/config/api';
+import Message from 'eoss/packages/message';
 const DEFAULT_SIZE = {
   xxl: 'large',
   xl: undefined,
@@ -678,7 +677,7 @@ export default {
             this.setConfig(res.results);
             this.$emit('initLogin', res.results);
           } else {
-            error(res.msg || '系统错误，请联系管理员！');
+            Message.error(res.msg || '系统错误，请联系管理员！');
           }
         })
         .catch((err) => {});

package/packages/login/src/resetPassword.vue

@@ -47,7 +47,7 @@ import {
 import { encryptFormData } from 'eoss/src/utils/helpers';
 import rules from 'eoss/src/utils/rules.js';
 import { ajax } from 'eoss/src/utils/ajax';
-import { error, success } from 'eoss/src/utils/util';
+import Message from 'eoss/packages/message';
 import EsForm from 'eoss/packages/form';
 import EsMenu from 'eoss/packages/menu';
 import EsMenuItem from 'eoss/packages/menu-item';
@@ -411,7 +411,7 @@ export default {
             }
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
-            error(msg);
+            Message.error(msg);
           }
         })
         .catch((err) => {});
@@ -479,7 +479,7 @@ export default {
     },
     handleSubmit() {
       this.submit = true;
-      let { repassword, ...data } = this.formData;;
+      let { repassword, ...data } = this.formData;
       debugger;
       // 使用工具函数加密数据
       data = encryptFormData(data, this.secret, this.isEncrypt);

package/packages/lowcode/src/attribute.vue

@@ -67,6 +67,7 @@ import { parseTemplateNodes } from './util/source-parser';
 import EsDialog from 'eoss/packages/dialog';
 import EsTabPane from 'eoss/packages/tab-pane';
 import EsTabs from 'eoss/packages/tabs';
+import Message from 'eoss/packages/message';
 // 原生 HTML 元素标签名集合
 const NATIVE_HTML_TAGS = new Set([
   'a',
@@ -516,7 +517,7 @@ export default {
           try {
             updates[name] = JSON.parse(value);
           } catch (e) {
-            this.$message.error('JSON 格式错误，请检查');
+            Message.error('JSON 格式错误，请检查');
             return;
           }
         } else {
@@ -596,7 +597,7 @@ export default {
         //  提取 <script> 标签中的内容
         const scriptMatch = source.match(/<script[^>]*>([\s\S]*?)<\/script>/);
         if (!scriptMatch) {
-          this.$message.error('脚本格式错误，缺少 <script> 标签');
+          Message.error('脚本格式错误，缺少 <script> 标签');
           return null;
         }
 
@@ -607,7 +608,7 @@ export default {
           /export\s+default\s*\{([\s\S]*)\}/
         );
         if (!exportMatch) {
-          this.$message.error('脚本格式错误，缺少 export default');
+          Message.error('脚本格式错误，缺少 export default');
           return null;
         }
 
@@ -670,7 +671,7 @@ export default {
             try {
               result.props = new Function(`return ${propsStr}`)();
             } catch (e2) {
-              this.$message.error('props 格式错误');
+              Message.error('props 格式错误');
               return null;
             }
           }
@@ -708,7 +709,7 @@ export default {
                   try {
                     result.data = new Function(`return ${dataStr}`)();
                   } catch (e2) {
-                    this.$message.error('data 格式错误');
+                    Message.error('data 格式错误');
                     return null;
                   }
                 }
@@ -725,7 +726,7 @@ export default {
           try {
             result.computed = new Function(`return ${computedStr}`)();
           } catch (e) {
-            this.$message.error('computed 格式错误');
+            Message.error('computed 格式错误');
             return null;
           }
           //  保存原始文本用于回显
@@ -738,7 +739,7 @@ export default {
           try {
             result.watch = new Function(`return ${watchStr}`)();
           } catch (e) {
-            this.$message.error('watch 格式错误');
+            Message.error('watch 格式错误');
             return null;
           }
           //  保存原始文本用于回显
@@ -751,7 +752,7 @@ export default {
           try {
             result.methods = new Function(`return ${methodsStr}`)();
           } catch (e) {
-            this.$message.error('methods 格式错误');
+            Message.error('methods 格式错误');
             return null;
           }
           //  保存原始文本用于回显
@@ -877,7 +878,7 @@ export default {
 
         return result;
       } catch (e) {
-        this.$message.error('脚本解析失败：' + e.message);
+        Message.error('脚本解析失败：' + e.message);
         return null;
       }
     }

package/packages/lowcode-view/src/view.vue

@@ -113,6 +113,7 @@ import EsDialog from 'eoss/packages/dialog';
 import EsIcon from 'eoss/packages/icon';
 import EsScrollbar from 'eoss/packages/scrollbar';
 import { getStorage } from 'eoss/src/utils/storage';
+import Message from 'eoss/packages/message';
 // 编辑态下布局末尾预留的投放区域高度：masonry 计入容器高度，流式布局用 padding-bottom
 const DROP_SPACE = 200;
 export default {
@@ -444,7 +445,7 @@ export default {
       })
         .then((res) => {
           if (res.rCode == 0 || res.status == 'success') {
-            this.$message.success('保存成功！');
+            Message.success('保存成功！');
             // 保存成功后重新拉取页面配置，刷新渲染数据
             this.getPagesMap();
             this.edit = false;
@@ -454,7 +455,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.error('系统错误！');
+          Message.error('系统错误！');
         })
         .finally(() => {
           loadingInstance.close();

package/packages/main/src/components/message.vue

@@ -79,12 +79,13 @@ import {
   ignoreSysMsg,
   ignoreAllSysMsg
 } from 'eoss/src/config/api.js';
-import { busEmit, error } from 'eoss/src/utils/util';
+import { busEmit } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 import { getStorage } from 'eoss/src/utils/storage';
 import EsDialog from 'eoss/packages/dialog';
 import EsDrawer from 'eoss/packages/drawer';
 import EsScrollbar from 'eoss/packages/scrollbar';
+import Message from 'eoss/packages/message';
 export default {
   name: 'Message',
   provide() {
@@ -207,7 +208,7 @@ export default {
           } else {
             this.loading = false;
             const msg = res.msg || '系统错误，请联系管理员！';
-            error(msg);
+            Message.error(msg);
           }
         })
         .catch(() => {
@@ -233,7 +234,7 @@ export default {
           this.msgs.splice(index, 1);
         } else {
           const msg = res.msg || '系统错误，请联系管理员！';
-          error(msg);
+          Message.error(msg);
         }
       });
     },
@@ -317,7 +318,7 @@ export default {
       const safeUrl = this.validateUrl(timestampUrl);
 
       if (!safeUrl) {
-        error('无效的URL地址');
+        Message.error('无效的URL地址');
         return;
       }
 
@@ -346,7 +347,7 @@ export default {
       const safeUrl = this.validateUrl(item.timestampUrl);
 
       if (!safeUrl) {
-        error('无效的URL地址');
+        Message.error('无效的URL地址');
         return;
       }
 
@@ -370,8 +371,7 @@ export default {
             this.windowIntervals.push(timer);
           }
         } catch (e) {
-          console.error('窗口打开失败:', e);
-          error('窗口打开失败');
+          Message.error('窗口打开失败');
         }
       } else {
         this.dialog = {

package/packages/main/src/components/notice.vue

@@ -62,11 +62,12 @@
 </template>
 <script>
 import { ignoreSysMsg, ignoreAllSysMsg } from 'eoss/src/config/api.js';
-import { busEmit, error } from 'eoss/src/utils/util';
+import { busEmit } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 import { getStorage } from 'eoss/src/utils/storage';
 import EsDialog from 'eoss/packages/dialog';
 import EsScrollbar from 'eoss/packages/scrollbar';
+import Message from 'eoss/packages/message';
 export default {
   name: 'Notice',
   provide() {
@@ -135,7 +136,7 @@ export default {
           this.msgs.splice(i, 1);
         } else {
           let msg = res.msg || '系统错误，请联系管理员！';
-          error(msg);
+          Message.error(msg);
         }
       });
     },

package/packages/main/src/components/pages.vue

@@ -100,10 +100,11 @@
           ></router-page>
           <wujie
             v-else-if="item.method === 'wujie'"
-            :name="item.appCode || item.code || item.id"
+            :name="wujieName(item)"
             :host="host"
             :url="item.url"
             :keys="item.keys"
+            alive
             @load-error="handleWujieLoadError(item)"
           ></wujie>
           <iframe
@@ -125,7 +126,12 @@
 
 <script>
 import { getStorage } from 'eoss/src/utils/storage';
-import { indexOfObj, uuid, timestampUrl } from 'eoss/src/utils/util';
+import {
+  indexOfObj,
+  uuid,
+  timestampUrl,
+  escapeRegexpString
+} from 'eoss/src/utils/util';
 import RouterPage from './router-page.vue';
 import Wujie from 'eoss/packages/wujie';
 
@@ -133,6 +139,20 @@ import EsCard from 'eoss/packages/card';
 import EsMenu from 'eoss/packages/menu';
 import EsTabPane from 'eoss/packages/tab-pane';
 import EsTabs from 'eoss/packages/tabs';
+
+/**
+ * @desc: Unicode 安全的 base64 编码，兼容中文等非 Latin1 字符
+ * @param {any} val 任意值，null/undefined 返回空串
+ * @return {string}
+ **/
+const base64 = (val) => {
+  if (val === null || val === undefined) return '';
+  try {
+    return window.btoa(unescape(encodeURIComponent(String(val))));
+  } catch (e) {
+    return '';
+  }
+};
 export default {
   name: 'Pages',
 
@@ -264,13 +284,33 @@ export default {
      * @date 2024年9月7日
      **/
     renderUrl(url) {
+      if (!url || typeof url !== 'string') return url;
       const userInfo = this.$main.userInfo || this.$main.userModel || {};
-      for (let key in userInfo) {
-        url = url.replace(new RegExp(`{${key}}`, 'g'), userInfo[key]);
-      }
+      Object.keys(userInfo).forEach((key) => {
+        const val = userInfo[key];
+        if (val === null || val === undefined) return;
+        const safeKey = escapeRegexpString(key);
+        const rawVal = String(val);
+        const b64Val = base64(rawVal);
+        // {base64-xxx} 与 {xxx} 两种占位符都要替换；
+        // 使用函数式 replacement，避免值中的 $& / $1 等被特殊解释
+        url = url.replace(
+          new RegExp(`\\{base64-${safeKey}\\}`, 'g'),
+          () => b64Val
+        );
+        url = url.replace(new RegExp(`\\{${safeKey}\\}`, 'g'), () => rawVal);
+      });
       return url;
     },
 
+    /**
+     * @desc:wujie 沙箱名按页签唯一，避免同一子应用多个菜单共用 name 时
+     * 互相 destroy/recreate 沙箱导致子应用重复启动
+     **/
+    wujieName(item) {
+      return `${item.appCode || item.code || item.id}__${item.id}`;
+    },
+
     handleSelect(res, index) {
       const { node } = res;
       if (node.urlopenmode === 1 || node.openModel === 1) {
@@ -282,7 +322,15 @@ export default {
       }
 
       const updatedTabs = [...this.newTabs];
-      updatedTabs[index].url = node.url;
+      const tab = updatedTabs[index];
+      if (tab.method === 'iframe') {
+        // iframe 走 url 变化刷新：加时间戳保证重复点击同一菜单也会重载
+        tab.url = timestampUrl(node.url);
+      } else {
+        // router/wujie 走 keys 变化刷新（url 单独变化不触发重建）
+        tab.url = node.url;
+        this.$set(tab, 'keys', uuid());
+      }
       this.$main.tabs = updatedTabs;
     },
     /**
@@ -377,10 +425,19 @@ export default {
     },
     /**
      * @desc:wujie 加载失败，降级为 iframe 加载（重定向/登录跳转等服务端页面无法被 wujie 的 fetch 加载）
+     * 降级结果必须写回 $main.tabs 源页签对象：isFourthTabs 下 newTabs 是副本，
+     * 只改副本会在下次 tabs 同步时回滚成 wujie，造成 wujie/iframe 反复重建（页面加载两次）
      **/
     handleWujieLoadError(item) {
+      if (item.method === 'iframe') {
+        return;
+      }
       this.$set(item, 'loading', true);
       this.$set(item, 'method', 'iframe');
+      const source = (this.$main.tabs || []).find((t) => t.id === item.id);
+      if (source && source !== item) {
+        this.$set(source, 'method', 'iframe');
+      }
     },
     /**
      * @desc:刷新iframe

package/packages/main/src/components/router-page.vue

@@ -54,8 +54,13 @@ export default {
   },
 
   computed: {
+    /**
+     * 组件 key 只由 appCode/path + refreshTrigger 组成，不包含 keys：
+     * keys 变化已由 watcher 走 doRefresh() 重建一次，
+     * 若再拼进 key 会导致同一次 keys 变化重建两次（页面加载两次）
+     */
     componentKey() {
-      return (this.keys || this.appCode) + (this.refreshTrigger ? '_r' : '');
+      return (this.appCode || this.path) + (this.refreshTrigger ? '_r' : '');
     }
   },