@lambo-design/shared 1.0.0-beta.361 → 1.0.0-beta.364

package/nstyles/components/table.less

@@ -78,6 +78,9 @@
       display: none !important;
       background-color: unset !important;
     }
+    .cell-span {
+      z-index: 2 !important;
+    }
     .ag-row.replicate-selected-row {
       // 当 .ag-row 包含 .replicate-selected-row 子元素时，为 .ag-row 添加 ::before
       &::after {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.361",
+  "version": "1.0.0-beta.364",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -26,8 +26,8 @@
     "nanoid": "^3.3.7",
     "node-rsa": "^1.1.1",
     "qs": "^6.11.0",
-    "@lambo-design/xlsx": "^1.0.0-beta.2",
-    "@lambo-design/xlsx-style": "^1.0.0-beta.9"
+    "@lambo-design/xlsx-style": "^1.0.0-beta.9",
+    "@lambo-design/xlsx": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "vue": "^2.6.12"

package/utils/base64.js

@@ -1,126 +1,126 @@
-let Base64 = {
-  Base64Chars:
-    "abcdefghijklmnopqrstuv" +
-    "wxyzABCDEFGHIJKLMNOP" +
-    "QRSTUVWXYZ0123456789@*-",
-  /**
-   * Encode a string to a Base64 string follow Bse64 regular.
-   * @param s, a normal string
-   * @return a Base64 string
-   */
-  encode: function (s) {
-    if (!s || s.length == 0) return s;
-
-    var d = "";
-    var b = this.ucs2_utf8(s);
-    var b0, b1, b2, b3;
-    var len = b.length;
-    var i = 0;
-    while (i < len) {
-      var tmp = b[i++];
-      b0 = (tmp & 0xfc) >> 2;
-      b1 = (tmp & 0x03) << 4;
-      if (i < len) {
-        tmp = b[i++];
-        b1 |= (tmp & 0xf0) >> 4;
-        b2 = (tmp & 0x0f) << 2;
-        if (i < len) {
-          tmp = b[i++];
-          b2 |= (tmp & 0xc0) >> 6;
-          b3 = tmp & 0x3f;
-        } else {
-          b3 = 64; // 1 byte "-" is supplement
-
-        }
-      } else {
-        b2 = b3 = 64; // 2 bytes "-" are supplement
-
-      }
-
-      d += this.Base64Chars.charAt(b0);
-      d += this.Base64Chars.charAt(b1);
-      d += this.Base64Chars.charAt(b2);
-      d += this.Base64Chars.charAt(b3);
-    }
-
-    return d;
-
-  },
-
-  /**
-   * Encodes a ucs2 string to a utf8 integer array.
-   * @param s, a string
-   * @return an integer array
-   */
-  ucs2_utf8: function (s) {
-    if (!s) return null;
-    var d = new Array();
-    if (s == "") return d;
-
-    var c = 0, i = 0, j = 0;
-    var len = s.length;
-    while (i < len) {
-      c = s.charCodeAt(i++);
-      if (c <= 0x7f) {
-        // 1 byte
-
-        d[j++] = c;
-      } else if ((c >= 0x80) && (c <= 0x7ff)) {
-        // 2 bytes
-
-        d[j++] = ((c >> 6) & 0x1f) | 0xc0;
-        d[j++] = (c & 0x3f) | 0x80;
-      } else {
-        // 3 bytes
-
-        d[j++] = (c >> 12) | 0xe0;
-        d[j++] = ((c >> 6) & 0x3f) | 0x80;
-        d[j++] = (c & 0x3f) | 0x80;
-      }
-    }
-
-    return d;
-  },
-  /**
-   * Encodes a utf8 integer array to a ucs2 string.
-   * @param s, an integer array
-   * @return a string
-   */
-  utf8_ucs2: function (s) {
-    if (!s) return null;
-    var len = s.length;
-    if (len == 0) return "";
-
-    var d = "";
-    var c = 0, i = 0, tmp = 0;
-    while (i < len) {
-      c = s[i++];
-      if ((c & 0xe0) == 0xe0) {
-        // 3 bytes
-
-        tmp = (c & 0x0f) << 12;
-        c = s[i++];
-        tmp |= ((c & 0x3f) << 6);
-        c = s[i++];
-        tmp |= (c & 0x3f);
-      } else if ((c & 0xc0) == 0xc0) {
-        // 2 bytes
-
-        tmp = (c & 0x1f) << 6;
-        c = s[i++];
-        tmp |= (c & 0x3f);
-      } else {
-        // 1 byte
-
-        tmp = c;
-      }
-
-      d += String.fromCharCode(tmp);
-    }
-
-    return d;
-  }
-};
-export {
-  Base64
-}
+let Base64 = {
+  Base64Chars:
+    "abcdefghijklmnopqrstuv" +
+    "wxyzABCDEFGHIJKLMNOP" +
+    "QRSTUVWXYZ0123456789@*-",
+  /**
+   * Encode a string to a Base64 string follow Bse64 regular.
+   * @param s, a normal string
+   * @return a Base64 string
+   */
+  encode: function (s) {
+    if (!s || s.length == 0) return s;
+
+    var d = "";
+    var b = this.ucs2_utf8(s);
+    var b0, b1, b2, b3;
+    var len = b.length;
+    var i = 0;
+    while (i < len) {
+      var tmp = b[i++];
+      b0 = (tmp & 0xfc) >> 2;
+      b1 = (tmp & 0x03) << 4;
+      if (i < len) {
+        tmp = b[i++];
+        b1 |= (tmp & 0xf0) >> 4;
+        b2 = (tmp & 0x0f) << 2;
+        if (i < len) {
+          tmp = b[i++];
+          b2 |= (tmp & 0xc0) >> 6;
+          b3 = tmp & 0x3f;
+        } else {
+          b3 = 64; // 1 byte "-" is supplement
+
+        }
+      } else {
+        b2 = b3 = 64; // 2 bytes "-" are supplement
+
+      }
+
+      d += this.Base64Chars.charAt(b0);
+      d += this.Base64Chars.charAt(b1);
+      d += this.Base64Chars.charAt(b2);
+      d += this.Base64Chars.charAt(b3);
+    }
+
+    return d;
+
+  },
+
+  /**
+   * Encodes a ucs2 string to a utf8 integer array.
+   * @param s, a string
+   * @return an integer array
+   */
+  ucs2_utf8: function (s) {
+    if (!s) return null;
+    var d = new Array();
+    if (s == "") return d;
+
+    var c = 0, i = 0, j = 0;
+    var len = s.length;
+    while (i < len) {
+      c = s.charCodeAt(i++);
+      if (c <= 0x7f) {
+        // 1 byte
+
+        d[j++] = c;
+      } else if ((c >= 0x80) && (c <= 0x7ff)) {
+        // 2 bytes
+
+        d[j++] = ((c >> 6) & 0x1f) | 0xc0;
+        d[j++] = (c & 0x3f) | 0x80;
+      } else {
+        // 3 bytes
+
+        d[j++] = (c >> 12) | 0xe0;
+        d[j++] = ((c >> 6) & 0x3f) | 0x80;
+        d[j++] = (c & 0x3f) | 0x80;
+      }
+    }
+
+    return d;
+  },
+  /**
+   * Encodes a utf8 integer array to a ucs2 string.
+   * @param s, an integer array
+   * @return a string
+   */
+  utf8_ucs2: function (s) {
+    if (!s) return null;
+    var len = s.length;
+    if (len == 0) return "";
+
+    var d = "";
+    var c = 0, i = 0, tmp = 0;
+    while (i < len) {
+      c = s[i++];
+      if ((c & 0xe0) == 0xe0) {
+        // 3 bytes
+
+        tmp = (c & 0x0f) << 12;
+        c = s[i++];
+        tmp |= ((c & 0x3f) << 6);
+        c = s[i++];
+        tmp |= (c & 0x3f);
+      } else if ((c & 0xc0) == 0xc0) {
+        // 2 bytes
+
+        tmp = (c & 0x1f) << 6;
+        c = s[i++];
+        tmp |= (c & 0x3f);
+      } else {
+        // 1 byte
+
+        tmp = c;
+      }
+
+      d += String.fromCharCode(tmp);
+    }
+
+    return d;
+  }
+};
+export {
+  Base64
+}

package/utils/locale/zh-CN.js

@@ -23,7 +23,7 @@ let zhCNData = {
         'white': '纯白',
         'canglan':'沧澜',
         'bd':'数字深蓝',
-        'bl':'烟叶绿',
+        'bl':'烟叶蓝',
         'b208':'208°蓝'
     },
     'pro-layout':{

package/utils/menu/generatorDynamicRouter.js

@@ -238,8 +238,11 @@ function generator(menuData, constantRouterComponents) {
         } else {
           try {
             let path = item.uri
-            if (item.uri.startsWith(config.routerBase + '/')) {
+            /*if (item.uri.startsWith(config.routerBase + '/')) {
               path = path.replace(config.routerBase + '/', '')
+            }*/
+            if (item.uri.indexOf(config.routerBase + "/") > -1) {
+              path = path.substr(item.uri.indexOf(config.routerBase + "/") + (config.routerBase + "/").length)
             }
             let query = {}
             if (path.indexOf('?') > -1) {

package/utils/menu/index.js

@@ -329,8 +329,11 @@ const generator = (menuData,constantRouterComponents) => {
                 } else {
                     try{
                         let path = item.uri;
-                        if (item.uri.startsWith(config.routerBase + "/")) {
+                        /*if (item.uri.startsWith(config.routerBase + "/")) {
                             path = path.replace(config.routerBase + "/","")
+                        }*/
+                        if (item.uri.indexOf(config.routerBase + "/") > -1) {
+                            path = path.substr(item.uri.indexOf(config.routerBase + "/") + (config.routerBase + "/").length)
                         }
                         let query = {};
                         if (path.indexOf("?") > -1) {

package/config/themes/atrovirens/var.css

@@ -1,29 +0,0 @@
-/*
-vxe-table
-*/
-/*font*/
-/*size*/
-/*icon*/
-/*color*/
-/*input/radio/checkbox*/
-/*popup*/
-/*table*/
-/*filter*/
-/*menu*/
-/*loading*/
-/*validate*/
-/*grid*/
-/*toolbar*/
-/*tooltip*/
-/*pager*/
-/*modal*/
-/*checkbox*/
-/*radio*/
-/*button*/
-/*input*/
-/*textarea*/
-/*form*/
-/*select*/
-/*switch*/
-/*pulldown*/
-/*# sourceMappingURL=var.css.map */

package/config/themes/atrovirens/var.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"var.css"}