eoss-ui 0.5.14 → 0.5.16

package/lib/input-number.js

@@ -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({

package/lib/input.js

@@ -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({

package/lib/login.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({

package/lib/main.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({

package/lib/nav.js

@@ -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({

package/lib/page.js

@@ -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({

package/lib/player.js

@@ -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({

package/lib/qr-code.js

@@ -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({

package/lib/radio-group.js

@@ -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({

package/lib/retrial-auth.js

@@ -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({

package/lib/select-ganged.js

@@ -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({

package/lib/select.js

@@ -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({

package/lib/selector-panel.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({

package/lib/selector.js

@@ -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({

package/lib/sizer.js

@@ -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({

package/lib/steps.js

@@ -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({

package/lib/switch.js

@@ -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({

package/lib/table-form.js

@@ -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({

package/lib/tabs.js

@@ -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({

package/lib/tips.js

@@ -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({

package/lib/tree-group.js

@@ -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({

package/lib/tree.js

@@ -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({

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({

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

@@ -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({

package/lib/wxlogin.js

@@ -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({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.14",
+  "version": "0.5.16",
   "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/data-table/src/column.vue

@@ -376,7 +376,7 @@
         v-else-if="type === 'handle' && !scope.row.hideHandle"
         v-bind="
           exclAttribute({
-            data: { ...config, prop: this.prop, field: this.field },
+            data: config,
             attrs: ['contents', 'events', 'type', 'width', 'template', 'title']
           })
         "
@@ -388,7 +388,7 @@
       ></es-button-group>
       <expand-dom
         v-else-if="render"
-        :column="{ ...config, prop: this.prop, field: this.field }"
+        :column="config"
         :row="scope.row"
         :render="render"
         :index="indexs"
@@ -468,8 +468,8 @@ export default {
     labelClassName: String,
     type: String,
     required: Boolean,
-    width: String,
-    minWidth: String,
+    width: [Number, String],
+    minWidth: [Number, String],
     hide: Boolean,
     showOverflowTooltip: Boolean,
     render: [Function, String],
@@ -541,9 +541,11 @@ export default {
           this.labelClassName ? this.labelClassName : '',
           this.required ? 'es-required' : ''
         ].join(' '),
+        prop: this.field || this.prop,
+        field: this.field,
         ...this.$attrs
       };
-      return { ...config, prop: this.field || this.prop, field: this.field };
+      return config;
     },
     formOption() {
       return {

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

@@ -321,7 +321,7 @@ export default {
     height: [Number, String],
     maxHeight: [Number, String],
     response: Function,
-    minWidth: String,
+    minWidth: [Number, String],
     border: {
       type: Boolean,
       default: false
@@ -491,6 +491,14 @@ export default {
     }
   },
   watch: {
+    showToolbar() {
+      this.resetHeight();
+      this.doLayout();
+    },
+    page() {
+      this.resetHeight();
+      this.doLayout();
+    },
     scale: {
       deep: true,
       handler(val) {
@@ -819,7 +827,9 @@ export default {
         .then((res) => {
           this.tableLoading = false;
           if (res.rCode === 0 || res.status === 'success') {
-            this.$refs.oaTable.resetScroll(0, 0);
+            this.$refs.oaTable &&
+              this.$refs.oaTable.resetScroll &&
+              this.$refs.oaTable.resetScroll(0, 0);
             let results =
               this.parseData !== undefined
                 ? this.parseData(res.results || res.data || res)

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.14',
+  version: '0.5.16',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -1901,7 +1901,11 @@ const isLogined = function ({
   // 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') &&