eoss-ui 0.4.10 → 0.4.15

package/packages/theme-chalk/src/ca-login.scss

@@ -0,0 +1,4 @@
+@import './common/var.scss';
+.es-ca-login {
+  cursor: pointer;
+}

package/packages/theme-chalk/src/index.scss

@@ -2,6 +2,7 @@
 @import "./button.scss";
 @import "./button-group.scss";
 @import "./checkbox-group.scss";
+@import "./ca-login.scss";
 @import "./card.scss";
 @import "./cascader.scss";
 @import "./clients.scss";

package/src/index.js

@@ -3,6 +3,7 @@
 import Button from '../packages/button/index.js';
 import ButtonGroup from '../packages/button-group/index.js';
 import CheckboxGroup from '../packages/checkbox-group/index.js';
+import CaLogin from '../packages/ca-login/index.js';
 import Card from '../packages/card/index.js';
 import Cascader from '../packages/cascader/index.js';
 import Clients from '../packages/clients/index.js';
@@ -54,6 +55,7 @@ const components = [
   Button,
   ButtonGroup,
   CheckboxGroup,
+  CaLogin,
   Card,
   Cascader,
   Clients,
@@ -113,11 +115,12 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.10',
+  version: '0.4.15',
   install,
   Button,
   ButtonGroup,
   CheckboxGroup,
+  CaLogin,
   Card,
   Cascader,
   Clients,

package/src/utils/util.js

@@ -326,7 +326,7 @@ const ajax = function ({
  * @param {String} [key] - 对象子元素的属性名
  **/
 const arrUnique = function (data, key) {
-  var newArr = [];
+  let newArr = [];
   if (key === undefined) {
     data.sort();
     newArr = [data[0]];
@@ -336,7 +336,7 @@ const arrUnique = function (data, key) {
       }
     }
   } else {
-    var obj = {};
+    let obj = {};
     for (let i = 0; i < data.length; i++) {
       if (!obj[data[i][key]]) {
         newArr.push(data[i]);
@@ -474,8 +474,8 @@ const esEncode = function (value) {
  * @param {string} [key] - 私钥
  **/
 const esDecode = function (value) {
-  var kleng = publicKey.length;
-  var result;
+  let kleng = publicKey.length;
+  let result;
   let cat1;
   let cat2;
   let cat3;
@@ -483,7 +483,7 @@ const esDecode = function (value) {
   let arr;
   arr = new Array(Math.floor(value.length / 3));
   result = arr.length;
-  for (var i = 0; i < result; i++) {
+  for (let i = 0; i < result; i++) {
     cat1 = publicKey.indexOf(value.charAt(num));
     num++;
     cat2 = publicKey.indexOf(value.charAt(num));
@@ -562,10 +562,11 @@ const exclAttribute = ({ attrs = 'value', data }) => {
  * @param {name} [string] - 导出文件名
  * @param {numbers} [boolean] - 序号
  **/
-const exportXls = function ({ thead = [], data = [], name, numbers }) {
+const exportXls = function ({ thead = [], data = [], name, numbers, option }) {
   let tbody = '';
   let aligns = [];
   let fields = [];
+  let keys = {};
   let others = {};
   let alink = document.createElement('a');
   for (let i = 0; i < thead.length; i++) {
@@ -573,14 +574,17 @@ const exportXls = function ({ thead = [], data = [], name, numbers }) {
     if (numbers) {
       tbody += '<th rowspan="' + thead.length + '"></th>';
     }
-    const tr = thead[i];
+    let tr = thead[i];
     let col = 0;
     for (let x = 0; x < tr.length; x++) {
-      const td = tr[x];
+      let td = tr[x];
       if (td.property) {
         if (col === x) {
           fields.push(td.property);
           aligns.push(td.align);
+          if (td.labelKey && td.valueKey) {
+            keys[td.property] = {labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string'])};
+          }
         } else {
           others[String(col)] = [td.property, td.align];
         }
@@ -601,16 +605,66 @@ const exportXls = function ({ thead = [], data = [], name, numbers }) {
   }
   for (let i = 0; i < data.length; i++) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[i][fields[x]] + '</td>';
+    for (let x in fields) {
+      let field = '';
+      let valueKey = keys[fields[x]] && keys[fields[x]].valueKey ? keys[fields[x]].valueKey : 'value';
+      let labelKey = keys[fields[x]] && keys[fields[x]].labelKey ? keys[fields[x]].labelKey : 'name';
+      if (option[fields[x]]) {
+        if (Array.isArray(data[i][fields[x]])) {
+          field = [];
+          data[i][fields[x]].forEach(ele => {
+              option[fields[x]].forEach(item => {
+                // eslint-disable-next-line eqeqeq
+                if (item[valueKey] == ele) {
+                  field.push(item[labelKey]);
+                  return;
+                }
+              });
+          });
+          field = field.join(' ');
+        } else if (typeof data[i][fields[x]] === 'string' && keys[fields[x]] && keys[fields[x]].multiple) {
+          field = [];
+          data[i][fields[x]].split(',').forEach(ele => {
+            option[fields[x]].forEach(item => {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[x]].forEach(item => {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[i][fields[x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (typeof data[i][fields[x]] === 'object' && keys[fields[x]]) {
+        if (Array.isArray(data[i][fields[x]])) {
+          data[i][fields[x]].forEach(item => {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[i][fields[x]][labelKey];
+        }
+      } else {
+        field = data[i][fields[x]];
+      }
+      tbody += '<td align="' + aligns[x] + '">' + field + '</td>';
     }
     tbody += '</tr>';
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
   }
-  var uri = 'data:application/vnd.ms-excel;base64,';
-  var template =
+  let uri = 'data:application/vnd.ms-excel;base64,';
+  let template =
     '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta charset="UTF-8"><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head><body><table style="vnd.ms-excel.numberformat:@">' +
     tbody +
     '</table></body></html>';
@@ -948,7 +1002,7 @@ const getSaturation = function ($s, $i, $isLight) {
 const getScript = function (url, callback) {
   // eslint-disable-next-line no-undef
   return new Promise((resolve, reject) => {
-    var xmlHttp = null;
+    let xmlHttp = null;
     if (win.XMLHttpRequest) {
       xmlHttp = new XMLHttpRequest();
     } else if (win.ActiveXObject) {
@@ -1170,15 +1224,15 @@ const getValues = function (obj, flag) {
  **/
 
 const handlerUrl = function (url, before) {
-  var arry = url.split('?');
+  let arry = url.split('?');
   if (arry.length > 2) {
     let ary = arry.splice(1, arry.length);
     arry.push(ary.join('?'));
   }
   if (arry.length > 1) {
     if (arry[1].indexOf('_tt') > -1) {
-      var search = arry[1].split('&');
-      for (var i in search) {
+      let search = arry[1].split('&');
+      for (let i in search) {
         if (search[i].indexOf('_tt') > -1) {
           search[i] = '_tt=' + new Date().getTime();
         }
@@ -1303,7 +1357,7 @@ const identical = function ({
  * @param {String} [key] - 目标对象的属性名
  **/
 const indexOfObj = function (arry, target, key) {
-  for (var i = 0; i < arry.length; i++) {
+  for (let i = 0; i < arry.length; i++) {
     if (key) {
       if (typeof target === 'string' && arry[i][key] === target) {
         return i;
@@ -1372,10 +1426,23 @@ const isLogged = function ({
   } else {
     const token = getStorage('token') || getStorage('Authorization');
     if (
-      Object.prototype.hasOwnProperty.call(to.query, 'serverId') &&
+      !token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') &&
       Object.prototype.hasOwnProperty.call(to.query, 'authType')
     ) {
-      const url = win.top.location.href;
+      let url = win.top.location.href;
+      if (to.query.openType) {
+        switch (to.query.openType) {
+          case 'self':
+            url = win.location.href;
+            break;
+          case 'blank':
+            url = win.location.href;
+            break;
+          case 'parent':
+            url = win.parent.location.href;
+            break;
+        }
+      }
       ajax({
         method: 'post',
         url: authCenter,
@@ -1405,10 +1472,27 @@ const isLogged = function ({
                 '{redirectUri}',
                 encodeURIComponent(url)
               );
-              if (open) {
-                win.open(href);
+              if (to.query.openType) {
+                switch (to.query.openType) {
+                  case 'self':
+                    win.location.href = href;
+                    break;
+                  case 'blank':
+                    win.open(href);
+                    break;
+                    case 'top':
+                      win.top.location.href = href;
+                    break;
+                    case 'parent':
+                      win.parent.location.href = href;
+                    break;
+                }
               } else {
-                win.top.location.href = href;
+                if (open) {
+                  win.open(href);
+                } else {
+                  win.top.location.href = href;
+                }
               }
               break;
           }
@@ -1423,12 +1507,13 @@ const isLogged = function ({
     } else if (
       token ||
       to.path === '/' ||
-      to.path === '/login' ||
       to.path === '/404' ||
-      exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1
+      exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 ||
+      to.path === '/login' ||
+      (token && to.path === '/main')
     ) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: `./${to.name}.html`, param: to.query }));
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: `.${to.path}.html`, param: to.query }));
       } else {
         next();
       }
@@ -1593,7 +1678,7 @@ const mixColor = function ($color1, $color2, $n) {
  **/
 const overbrim = function (el) {
   let w = el.offsetWidth;
-  var s = el.scrollWidth;
+  let s = el.scrollWidth;
   if (s > w) {
     return true;
   } else {
@@ -1749,7 +1834,7 @@ const sendMessage = function ({ data = {}, url }) {
  * @param {String} [url] - 图标地址
  **/
 const setFavicon = function (url) {
-  var link = document.querySelector("link[rel*='icon']");
+  let link = document.querySelector("link[rel*='icon']");
   if (link) {
     link.href = url;
   } else {
@@ -1842,13 +1927,13 @@ const startWith = function (value, reg, or = false) {
  * @param {Number} [wait] - 延迟毫秒数
  **/
 const throttle = function (fn, wait) {
-  var timer = null;
-  var startTime = Date.now();
+  let timer = null;
+  let startTime = Date.now();
   return function () {
-    var curTime = Date.now();
-    var remaining = wait - (curTime - startTime);
-    var context = this;
-    var args = arguments;
+    let curTime = Date.now();
+    let remaining = wait - (curTime - startTime);
+    let context = this;
+    let args = arguments;
     clearTimeout(timer);
     if (remaining <= 0) {
       fn.apply(context, args);
@@ -2037,9 +2122,9 @@ const watermark = function (option) {
   let { rows, cols, html, angle, color, height, lineHeight, opacity, fontSize, fontWeight, fontFamily, textAlign, zIndex } = options;
 
   wrap.style.cssText = 'display: flex;align-items: center;justify-content: flex-start;flex-wrap: wrap;align-content: space-between;position: fixed;left: 50%;top: 50%;transform: translate(-50%, -50%);height: 100vh;width: 100vw;pointer-events: none;overflow: hidden;background: transparent;z-index: ' + zIndex + ';';
-  var num = rows * cols;
-  for (var i = 0; i < num; i++) {
-    var item = document.createElement('div');
+  let num = rows * cols;
+  for (let i = 0; i < num; i++) {
+    let item = document.createElement('div');
     item.innerHTML = html;
     item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + (100 / cols) + '%;height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);