eoss-ui 0.4.10 → 0.4.15

package/lib/data-table-form.js

@@ -533,7 +533,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -638,11 +638,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -652,12 +654,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        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];
         }
@@ -675,12 +680,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1401,8 +1466,21 @@ var isLogged = function isLogged(_ref8) {
     next();
   } else {
     var token = getStorage('token') || getStorage('Authorization');
-    if (Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+    if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       var 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: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1429,10 +1507,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{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;
           }
@@ -1444,9 +1539,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }

package/lib/data-table.js

@@ -533,7 +533,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -638,11 +638,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -652,12 +654,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        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];
         }
@@ -675,12 +680,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1401,8 +1466,21 @@ var isLogged = function isLogged(_ref8) {
     next();
   } else {
     var token = getStorage('token') || getStorage('Authorization');
-    if (Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+    if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       var 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: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1429,10 +1507,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{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;
           }
@@ -1444,9 +1539,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }
@@ -2646,8 +2741,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/data-table/src/main.vue?vue&type=template&id=97c4c582&
-var mainvue_type_template_id_97c4c582_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=154b78e2&
+var mainvue_type_template_id_154b78e2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2980,10 +3075,10 @@ var mainvue_type_template_id_97c4c582_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_97c4c582_render._withStripped = true
+mainvue_type_template_id_154b78e2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=97c4c582&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=154b78e2&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3036,8 +3131,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=177bef1c&
-var columnvue_type_template_id_177bef1c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
+var columnvue_type_template_id_1f31fcc6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3054,6 +3149,8 @@ var columnvue_type_template_id_177bef1c_render = function () {
         attrs: {
           "filter-icon": _vm.filterIcon,
           label: _vm.item.title || _vm.item.label,
+          "label-key": _vm.item.labelKey,
+          "value-key": _vm.item.valueKey,
           prop: _vm.item.field || _vm.item.prop,
           fixed: _vm.item.fixed,
           sortable: _vm.item.sortable || _vm.item.sort,
@@ -3929,6 +4026,8 @@ var columnvue_type_template_id_177bef1c_render = function () {
           attrs: {
             "filter-icon": _vm.filterIcon,
             label: _vm.item.title || _vm.item.label,
+            "label-key": _vm.item.labelKey,
+            "value-key": _vm.item.valueKey,
             prop: _vm.item.field || _vm.item.prop,
             fixed: _vm.item.fixed,
             sortable: _vm.item.sortable || _vm.item.sort,
@@ -3993,11 +4092,11 @@ var columnvue_type_template_id_177bef1c_render = function () {
         2
       )
 }
-var columnvue_type_template_id_177bef1c_staticRenderFns = []
-columnvue_type_template_id_177bef1c_render._withStripped = true
+var columnvue_type_template_id_1f31fcc6_staticRenderFns = []
+columnvue_type_template_id_1f31fcc6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=177bef1c&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -4561,6 +4660,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -4761,8 +4864,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var data = col.data ? col.data : col.optionData ? rows[col.optionData] : this.optionDatas[field];
       if (util["a" /* default */].isObject(rows[field])) {
         return rows[field][col.labelKey] || rows[field]['name'] || rows[field]['label'] || rows[field]['shortName'];
-      }
-      if (Array.isArray(rows[field])) {
+      } else if (Array.isArray(rows[field])) {
         var vals = rows[field].map(function (item) {
           if (util["a" /* default */].isObject(item)) {
             return item[col.labelKey] || item['name'] || item['label'] || item['shortName'];
@@ -4774,12 +4876,22 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           }
         });
         return vals.join(col.symbol ? col.symbol : '-');
+      } else {
+        if (col.valueToString || col['value-to-string']) {
+          var _vals = rows[field].split(',').map(function (item) {
+            if (data && data.length && util["a" /* default */].isObject(data[0])) {
+              return _this2.getLabel(data, item, col);
+            }
+            return item;
+          });
+          return _vals.join(col.symbol ? col.symbol : '-');
+        } else {
+          if (data && data.length && util["a" /* default */].isObject(data[0])) {
+            return this.getLabel(data, rows[field], col);
+          }
+          return rows[field];
+        }
       }
-
-      if (data && data.length && util["a" /* default */].isObject(data[0])) {
-        return this.getLabel(data, rows[field], col);
-      }
-      return rows[field];
     },
     getLabel: function getLabel(obj, val, col) {
       for (var i = 0; i < obj.length; i++) {
@@ -4886,8 +4998,8 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_177bef1c_render,
-  columnvue_type_template_id_177bef1c_staticRenderFns,
+  columnvue_type_template_id_1f31fcc6_render,
+  columnvue_type_template_id_1f31fcc6_staticRenderFns,
   false,
   null,
   null,
@@ -6217,7 +6329,8 @@ var mainvue_type_script_lang_js_components;
           util["a" /* default */].exportXls({
             thead: thead,
             data: this.datas,
-            name: this.fileName
+            name: this.fileName,
+            option: this.optionDatas
           });
         }
         this.$emit('btnClick', res, this.datas, thead, rows);
@@ -6385,7 +6498,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_97c4c582_render,
+  mainvue_type_template_id_154b78e2_render,
   staticRenderFns,
   false,
   null,