eoss-ui 0.4.10 → 0.4.14

package/lib/form.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 40);
+/******/ 	return __webpack_require__(__webpack_require__.s = 41);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -534,7 +534,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;
@@ -639,11 +639,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++) {
@@ -653,12 +655,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];
         }
@@ -676,12 +681,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();
@@ -1430,10 +1495,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;
           }
@@ -1445,9 +1527,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();
       }
@@ -2612,14 +2694,14 @@ module.exports = require("axios");
 
 /***/ }),
 
-/***/ 40:
+/***/ 41:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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/form/src/main.vue?vue&type=template&id=7542ec09&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=79406044&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -11168,7 +11250,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7542ec09&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=79406044&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -14517,10 +14599,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
   },
   props: {
     model: {
-      type: [Object, String],
-      default: function _default() {
-        return {};
-      }
+      type: [Object, String]
     },
     steps: Object,
     param: {
@@ -14672,6 +14751,14 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     models: {
       get: function get() {
         if (this.model && typeof this.model !== 'string') {
+          if (this.autoId && !this.businessId) {
+            if (this.model[typeof this.autoId === 'string' ? this.autoId : 'id']) {
+              this.$emit('update:businessId', this.model[typeof this.autoId === 'string' ? this.autoId : 'id']);
+            } else {
+              this.$emit('update:businessId', this.uuid);
+              this.$emit('getId', this.uuid);
+            }
+          }
           return this.model;
         }
         return this.values;
@@ -14683,14 +14770,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     _value: function _value() {
       var data = {};
       if (this.businessId !== undefined) {
-        data = { id: this.businessId };
+        data[typeof this.autoId === 'string' ? this.autoId : 'id'] = this.businessId;
       } else if (typeof this.model !== 'string' && this.autoId) {
         if (typeof this.autoId === 'boolean' && !this.model.id) {
           data = { id: this.uuid };
-          this.$emit('update:businessId', this.uuid);
         } else if (!this.model[this.autoId]) {
           data[this.autoId] = this.uuid;
-          this.$emit('update:businessId', this.uuid);
         }
       }
       return util["a" /* default */].extend({}, data, this.value);

package/lib/handle-user.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 42);
+/******/ 	return __webpack_require__(__webpack_require__.s = 43);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -534,7 +534,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;
@@ -639,11 +639,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++) {
@@ -653,12 +655,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];
         }
@@ -676,12 +681,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();
@@ -1430,10 +1495,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;
           }
@@ -1445,9 +1527,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();
       }
@@ -2587,7 +2669,7 @@ module.exports = require("axios");
 
 /***/ }),
 
-/***/ 42:
+/***/ 43:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/handler.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 43);
+/******/ 	return __webpack_require__(__webpack_require__.s = 44);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -534,7 +534,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;
@@ -639,11 +639,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++) {
@@ -653,12 +655,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];
         }
@@ -676,12 +681,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();
@@ -1430,10 +1495,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;
           }
@@ -1445,9 +1527,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();
       }
@@ -2587,7 +2669,7 @@ module.exports = require("axios");
 
 /***/ }),
 
-/***/ 43:
+/***/ 44:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";