eoss 0.1.0-alpha.37 → 0.1.0-alpha.38

package/lib/main.js

@@ -14489,8 +14489,8 @@ var notice_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var notice = (notice_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/pages.vue?vue&type=template&id=35e35b04&scoped=true&
-var pagesvue_type_template_id_35e35b04_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/pages.vue?vue&type=template&id=0340e2fa&scoped=true&
+var pagesvue_type_template_id_0340e2fa_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14720,11 +14720,11 @@ var pagesvue_type_template_id_35e35b04_scoped_true_render = function () {
     1
   )
 }
-var pagesvue_type_template_id_35e35b04_scoped_true_staticRenderFns = []
-pagesvue_type_template_id_35e35b04_scoped_true_render._withStripped = true
+var pagesvue_type_template_id_0340e2fa_scoped_true_staticRenderFns = []
+pagesvue_type_template_id_0340e2fa_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=35e35b04&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=0340e2fa&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/router-page.vue?vue&type=template&id=bcc739f0&
 var router_pagevue_type_template_id_bcc739f0_render = function () {
@@ -15073,6 +15073,20 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 
 
+
+/**
+ * @desc: Unicode 安全的 base64 编码，兼容中文等非 Latin1 字符
+ * @param {any} val 任意值，null/undefined 返回空串
+ * @return {string}
+ **/
+var base64 = function base64(val) {
+  if (val === null || val === undefined) return '';
+  try {
+    return window.btoa(unescape(encodeURIComponent(String(val))));
+  } catch (e) {
+    return '';
+  }
+};
 /* harmony default export */ var pagesvue_type_script_lang_js_ = ({
   name: 'Pages',
 
@@ -15201,10 +15215,23 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
      * @date 2024年9月7日
      **/
     renderUrl: function renderUrl(url) {
+      if (!url || typeof url !== 'string') return url;
       var userInfo = this.$main.userInfo || this.$main.userModel || {};
-      for (var key in userInfo) {
-        url = url.replace(new RegExp('{' + key + '}', 'g'), userInfo[key]);
-      }
+      Object.keys(userInfo).forEach(function (key) {
+        var val = userInfo[key];
+        if (val === null || val === undefined) return;
+        var safeKey = Object(util["n" /* escapeRegexpString */])(key);
+        var rawVal = String(val);
+        var b64Val = base64(rawVal);
+        // {base64-xxx} 与 {xxx} 两种占位符都要替换；
+        // 使用函数式 replacement，避免值中的 $& / $1 等被特殊解释
+        url = url.replace(new RegExp('\\{base64-' + safeKey + '\\}', 'g'), function () {
+          return b64Val;
+        });
+        url = url.replace(new RegExp('\\{' + safeKey + '\\}', 'g'), function () {
+          return rawVal;
+        });
+      });
       return url;
     },
     handleSelect: function handleSelect(res, index) {
@@ -15450,11 +15477,11 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var pages_component = Object(componentNormalizer["a" /* default */])(
   components_pagesvue_type_script_lang_js_,
-  pagesvue_type_template_id_35e35b04_scoped_true_render,
-  pagesvue_type_template_id_35e35b04_scoped_true_staticRenderFns,
+  pagesvue_type_template_id_0340e2fa_scoped_true_render,
+  pagesvue_type_template_id_0340e2fa_scoped_true_staticRenderFns,
   false,
   null,
-  "35e35b04",
+  "0340e2fa",
   null
   
 )

package/lib/menu-item-group.js

@@ -750,7 +750,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
 
     // 获取菜单图标颜色
-    getColor: function getColor(index) {
+    getColor: function getColor(index, item) {
       if (!this.iconColors) {
         return undefined;
       }
@@ -759,7 +759,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       if (!this._colorCache) {
         this._colorCache = {};
       }
-
+      var isParentMenuIcon = item.children && item.children.length || this.isFourthTabs && item.fourthTabs && item.fourthTabs.length;
       var key = Array.isArray(this.iconColors) ? 'index_' + index % this.iconColors.length : 'single_color';
 
       if (!this._colorCache[key]) {
@@ -767,7 +767,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         this._colorCache[key] = {
           '--icon-bg-color': bgColor,
           '--icon-color': '#fff',
-          '--icon-font-size': '12px'
+          '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
         };
       }
 
@@ -793,7 +793,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           extendData = item.extendData,
           rest = _objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
 
-      var openStatus = open || Boolean(extendData.openStatus);
+      var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
       var props = void 0;
       if (this.isFourthTabs) {
         if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {

package/lib/menu.js

@@ -4748,8 +4748,8 @@ module.exports = require("vue");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/menu.vue?vue&type=template&id=7ad225cf&
-var menuvue_type_template_id_7ad225cf_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/menu.vue?vue&type=template&id=31887554&
+var menuvue_type_template_id_31887554_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4805,7 +4805,7 @@ var menuvue_type_template_id_7ad225cf_render = function () {
                             "open-icon": _vm.openIcon,
                             "close-icon": _vm.closeIcon,
                             isFourthTabs: _vm.isFourthTabs,
-                            iconColor: _vm.getColor(index),
+                            iconColor: _vm.getColor(index, item),
                             iconColors: _vm.iconColors,
                           },
                         },
@@ -4844,10 +4844,10 @@ var menuvue_type_template_id_7ad225cf_render = function () {
   )
 }
 var staticRenderFns = []
-menuvue_type_template_id_7ad225cf_render._withStripped = true
+menuvue_type_template_id_31887554_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=7ad225cf&
+// CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=31887554&
 
 // EXTERNAL MODULE: ./packages/menu/src/mixins.js
 var mixins = __webpack_require__(80);
@@ -5696,7 +5696,7 @@ var componentNormalizer = __webpack_require__(4);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_menuvue_type_script_lang_js_,
-  menuvue_type_template_id_7ad225cf_render,
+  menuvue_type_template_id_31887554_render,
   staticRenderFns,
   false,
   null,
@@ -10499,7 +10499,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
 
     // 获取菜单图标颜色
-    getColor: function getColor(index) {
+    getColor: function getColor(index, item) {
       if (!this.iconColors) {
         return undefined;
       }
@@ -10508,7 +10508,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       if (!this._colorCache) {
         this._colorCache = {};
       }
-
+      var isParentMenuIcon = item.children && item.children.length || this.isFourthTabs && item.fourthTabs && item.fourthTabs.length;
       var key = Array.isArray(this.iconColors) ? 'index_' + index % this.iconColors.length : 'single_color';
 
       if (!this._colorCache[key]) {
@@ -10516,7 +10516,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         this._colorCache[key] = {
           '--icon-bg-color': bgColor,
           '--icon-color': '#fff',
-          '--icon-font-size': '12px'
+          '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
         };
       }
 
@@ -10542,7 +10542,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           extendData = item.extendData,
           rest = _objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
 
-      var openStatus = open || Boolean(extendData.openStatus);
+      var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
       var props = void 0;
       if (this.isFourthTabs) {
         if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {

package/lib/submenu.js

@@ -4481,7 +4481,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
 
     // 获取菜单图标颜色
-    getColor: function getColor(index) {
+    getColor: function getColor(index, item) {
       if (!this.iconColors) {
         return undefined;
       }
@@ -4490,7 +4490,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       if (!this._colorCache) {
         this._colorCache = {};
       }
-
+      var isParentMenuIcon = item.children && item.children.length || this.isFourthTabs && item.fourthTabs && item.fourthTabs.length;
       var key = Array.isArray(this.iconColors) ? 'index_' + index % this.iconColors.length : 'single_color';
 
       if (!this._colorCache[key]) {
@@ -4498,7 +4498,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         this._colorCache[key] = {
           '--icon-bg-color': bgColor,
           '--icon-color': '#fff',
-          '--icon-font-size': '12px'
+          '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
         };
       }
 
@@ -4524,7 +4524,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           extendData = item.extendData,
           rest = _objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
 
-      var openStatus = open || Boolean(extendData.openStatus);
+      var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
       var props = void 0;
       if (this.isFourthTabs) {
         if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {

package/package.json

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

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

@@ -125,7 +125,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 +138,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,10 +283,22 @@ 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;
     },
 

package/packages/menu/src/menu.vue

@@ -40,7 +40,7 @@
               :open-icon="openIcon"
               :close-icon="closeIcon"
               :isFourthTabs="isFourthTabs"
-              :iconColor="getColor(index)"
+              :iconColor="getColor(index, item)"
               :iconColors="iconColors"
             ></component>
           </slot>

package/packages/menu/src/mixins.js

@@ -49,7 +49,7 @@ export default {
       return componentType;
     },
     // 获取菜单图标颜色
-    getColor(index) {
+    getColor(index, item) {
       if (!this.iconColors) {
         return undefined;
       }
@@ -58,7 +58,7 @@ export default {
       if (!this._colorCache) {
         this._colorCache = {};
       }
-
+      const isParentMenuIcon = item.children && item.children.length || (this.isFourthTabs && item.fourthTabs && item.fourthTabs.length);
       const key = Array.isArray(this.iconColors) ? `index_${index % this.iconColors.length}` : 'single_color';
 
       if (!this._colorCache[key]) {
@@ -66,7 +66,7 @@ export default {
         this._colorCache[key] = {
           '--icon-bg-color': bgColor,
           '--icon-color': '#fff',
-          '--icon-font-size': '12px'
+          '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
         };
       }
 
@@ -89,7 +89,7 @@ export default {
       }
 
       const { id, index, open, extendData, ...rest } = item;
-      const openStatus = open || Boolean(extendData.openStatus);
+      const openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
       let props;
       if (this.isFourthTabs) {
         if ((item.children && item.children.length) || (item.fourthTabs && item.fourthTabs.length)) {

package/src/index.js

@@ -266,7 +266,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.1.0-alpha.37',
+  version: '0.1.0-alpha.38',
   install,
   CollapseTransition,
   Loading,