eoss-ui 0.5.13 → 0.5.15

package/lib/tips.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 62);
+/******/ 	return __webpack_require__(__webpack_require__.s = 63);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3453,7 +3457,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 62:
+/***/ 63:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/toolbar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 78);
+/******/ 	return __webpack_require__(__webpack_require__.s = 79);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 78:
+/***/ 79:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 64);
+/******/ 	return __webpack_require__(__webpack_require__.s = 65);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3453,7 +3457,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 64:
+/***/ 65:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 63);
+/******/ 	return __webpack_require__(__webpack_require__.s = 64);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3453,7 +3457,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 63:
+/***/ 64:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/upload.js

@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3628,13 +3632,13 @@ window.__store = store;
 /* 22 */,
 /* 23 */,
 /* 24 */,
-/* 25 */
+/* 25 */,
+/* 26 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
-/* 26 */,
 /* 27 */,
 /* 28 */,
 /* 29 */,
@@ -4062,7 +4066,7 @@ var util = __webpack_require__(0);
 var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(25);
+var external_js_base64_ = __webpack_require__(26);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

package/lib/utils/util.js

@@ -1883,7 +1883,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 66);
+/******/ 	return __webpack_require__(__webpack_require__.s = 67);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3453,7 +3457,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 66:
+/***/ 67:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 67);
+/******/ 	return __webpack_require__(__webpack_require__.s = 68);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    next && next();
+    if (to.path === '/main' || to.path === '/login') {
+      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
+    } else {
+      next && next();
+    }
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
@@ -3453,7 +3457,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 67:
+/***/ 68:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -112,7 +112,7 @@
     "gulp-autoprefixer": "^6.0.0",
     "gulp-cssmin": "^0.2.0",
     "gulp-sass": "^4.0.2",
-    "highlight.js": "^9.3.0",
+    "highlight.js": "^11.9.0",
     "html-webpack-plugin": "^3.2.0",
     "json-loader": "^0.5.7",
     "json-templater": "^1.0.4",

package/packages/checkbox-group/src/main.vue

@@ -57,15 +57,13 @@
 import { findSysCode } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
+import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsCheckboxGroup',
   inheritAttrs: false,
   inject: {
     esForm: {
       default: ''
-    },
-    sysCodes: {
-      default: ''
     }
   },
   props: {
@@ -226,30 +224,11 @@ export default {
       handler() {
         this.url && this.getData(this.url);
       }
-    },
-    sysCodes: {
-      deep: true,
-      handler(val) {
-        if (
-          this.canceled &&
-          val &&
-          ((this.sysCode && val[this.sysCode]) ||
-            (this.dataKey && val[this.dataKey]))
-        ) {
-          if (this.parseData) {
-            this.options = this.parseData(
-              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
-            );
-          } else {
-            this.options = JSON.parse(
-              JSON.stringify(val[this.sysCode || this.dataKey])
-            );
-          }
-        }
-      }
     }
   },
-  created() {},
+  created() {
+    this.bindEventBus();
+  },
   mounted() {},
   methods: {
     getData(url, sysCode) {
@@ -283,11 +262,10 @@ export default {
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
             if (sysCode || this.dataKey) {
-              this.esForm &&
-                this.esForm.setSysCodes(
-                  sysCode || this.dataKey,
-                  JSON.parse(JSON.stringify(this.options))
-                );
+              bus.$emit(
+                sysCode || this.dataKey,
+                JSON.parse(JSON.stringify(this.options))
+              );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           } else {
@@ -315,7 +293,19 @@ export default {
         );
       }
       return util.isObject(res) ? { ...attrs, ...res } : attrs;
+    },
+    setOptions(val) {
+      this.options = val;
+    },
+    bindEventBus() {
+      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+    },
+    unbindEventBus() {
+      bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
+  },
+  beforeDestroy() {
+    this.unbindEventBus();
   }
 };
 </script>

package/packages/data-table/src/children.vue

@@ -1,18 +1,14 @@
 <template>
   <column v-bind="$attrs" v-on="$listeners">
-    <template v-if="childrens && childrens.length">
+    <template v-if="childrens.length">
       <template v-for="(item, index) in childrens">
         <children
           v-if="item.hide !== true"
           :key="index"
           v-bind="{
             ...$attrs,
-            filterIcon: false,
-            item: item,
-            width: item.width,
-            index: index,
-            children: item.children,
-            childHead: item.childHead
+            ...item,
+            indexs: index
           }"
           v-on="$listeners"
         ></children
@@ -33,7 +29,7 @@ export default {
   },
   computed: {
     childrens() {
-      return this.children || this.childHead;
+      return this.children || this.childHead || [];
     }
   }
 };