eoss-ui 0.5.16 → 0.5.18

package/lib/input-number.js

@@ -1966,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1965,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1883,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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,11 +1966,7 @@ var isLogined = function isLogined(_ref8) {
   // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
   if (token || cookie == true || cookie == 1) {
-    if (to.path === '/main' || to.path === '/login') {
-      window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
-    } else {
-      next && next();
-    }
+    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.16",
+  "version": "0.5.18",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.75",
+    "eoss-element": "^0.2.76",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -372,20 +372,6 @@
           </template>
         </el-form-item>
       </template>
-      <es-button-group
-        v-else-if="type === 'handle' && !scope.row.hideHandle"
-        v-bind="
-          exclAttribute({
-            data: config,
-            attrs: ['contents', 'events', 'type', 'width', 'template', 'title']
-          })
-        "
-        stop
-        :contents="contents || events"
-        :data="scope.row"
-        @handleClick="handleClick"
-        v-model="btnWidth"
-      ></es-button-group>
       <expand-dom
         v-else-if="render"
         :column="config"
@@ -400,6 +386,20 @@
       <span v-else :style="styles ? styles[scope.row[prop]] : {}">{{
         format(scope.row)
       }}</span>
+      <es-button-group
+        v-if="type === 'handle' && !scope.row.hideHandle"
+        v-bind="
+          exclAttribute({
+            data: config,
+            attrs: ['contents', 'events', 'type', 'width', 'template', 'title']
+          })
+        "
+        stop
+        :contents="contents || events"
+        :data="scope.row"
+        @handleClick="handleClick"
+        v-model="btnWidth"
+      ></es-button-group>
     </template>
   </el-table-column>
 </template>
@@ -541,6 +541,7 @@ export default {
           this.labelClassName ? this.labelClassName : '',
           this.required ? 'es-required' : ''
         ].join(' '),
+        showOverflowTooltip: this.showOverflowTooltip,
         prop: this.field || this.prop,
         field: this.field,
         ...this.$attrs

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

@@ -604,8 +604,7 @@ export default {
     handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      }
-      if (util.win.top.opener) {
+      }else if (util.win.top.opener) {
         util.win.top.close();
       }
       if (this.events && this.events.success) {

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

@@ -54,6 +54,11 @@ $end: -51;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
+  // .cell, span{
+  //   text-overflow: ellipsis;
+  //   white-space: nowrap;
+  //   overflow: hidden;
+  // }
 }
 @for $i from 2 through 6 {
   .es-text-ellipsis-row#{$i} {

package/src/index.js

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

package/src/utils/util.js

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