eoss-ui 0.5.10 → 0.5.11

package/lib/wxlogin.js

@@ -746,6 +746,7 @@ var delUrlParam = function delUrlParam(_ref2) {
       key.forEach(function (item) {
         if (param.hasOwnProperty(item)) {
           var reg = item + '=' + param[item];
+          console.log(reg);
           if (src.indexOf(reg + '&') > -1) {
             src = src.replace(reg + '&', '');
           } else if (src.indexOf('&' + reg) > -1) {
@@ -1946,7 +1947,6 @@ var isLogined = function isLogined(_ref8) {
       next = _ref8.next,
       _ref8$exclude = _ref8.exclude,
       exclude = _ref8$exclude === undefined ? [] : _ref8$exclude,
-      open = _ref8.open,
       cookie = _ref8.cookie,
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
@@ -1954,24 +1954,24 @@ var isLogined = function isLogined(_ref8) {
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
+  var pathname = win.top.location.pathname;
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
-      var pathname = win.top.location.pathname;
       if (pathname !== '/') {
-        pathname = pathname.split('/');
-        pathname.splice(pathname.length - 1);
-        pathname = pathname.join('/');
-        loginPage = pathname + '/' + loginPage.replace('./', '');
+        var path = pathname.split('/');
+        path.splice(pathname.length - 1);
+        path = path.join('/');
+        loginPage = path + '/' + loginPage.replace('./', '');
       } else {
         loginPage = pathname + loginPage.replace('./', '');
       }
     }
   }
   var token = getStorage('token') || getStorage('Authorization');
-  var logined = getStorage('logined');
+  // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
-  if (token || logined || cookie == true || cookie == 1) {
+  if (token || cookie == true || cookie == 1) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
@@ -1995,37 +1995,22 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              next();
+              var url = delUrlParam({
+                url: win.top.location.href,
+                key: ['serverId', 'authType', 'code', 'sessionId']
+              });
+              win.top.location.href = url;
+              setTimeout(function () {
+                win.top.location.reload();
+              }, 200);
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var url = win.top.location.href;
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              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 {
-                if (open) {
-                  win.open(href);
-                } else {
-                  win.top.location.href = href;
-                }
-              }
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+              win.top.location.href = href;
               break;
             case 4:
               eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -12,6 +12,7 @@
       v-if="showToolbar"
       v-bind="{
         contents: toolbars,
+        showLabel: showLabel,
         close: close,
         callBack: resetHeight,
         showFormBtn: showFormBtn,
@@ -281,6 +282,7 @@ export default {
       type: [Array, Boolean],
       default: false
     },
+    showLabel: Boolean,
     searchValue: Object,
     advanceValue: Object,
     // 是否开启序号
@@ -725,26 +727,32 @@ export default {
     },
     handleClickAddData(scope) {
       const data = JSON.parse(JSON.stringify(scope.row));
-      const index = scope.$index + 1;
-      this.datas.splice(index, 0, data);
+      let index = scope.$index + 1;
+      if (this.page) {
+        index += (this.config.pageNum - 1) * this.config.pageSize;
+      }
+      this.data.splice(index, 0, data);
       this.$emit('dataChange', 'add', data);
       this.$emit('btnClick', {
         event: 'addRow',
         row: data,
         index: index,
-        data: data
+        data: this.data
       });
     },
     handleClickDeleteData(scope) {
       const data = JSON.parse(JSON.stringify(scope.row));
-      const index = scope.$index;
-      this.datas.splice(index, 1);
+      let index = scope.$index;
+      if (this.page) {
+        index += (this.config.pageNum - 1) * this.config.pageSize;
+      }
+      this.data.splice(index, 1);
       this.$emit('dataChange', 'delete', data);
       this.$emit('btnClick', {
         event: 'deleteRow',
         row: data,
         index: index,
-        data: this.datas
+        data: this.data
       });
     },
     checkSelect(newVal) {

package/packages/form/src/main.vue

@@ -72,9 +72,7 @@
                       >
                         <es-label
                           v-if="item.label"
-                          :contents="item.label"
-                          :event="item.label.event"
-                          :events="item.label.events"
+                          v-bind="getLabel(item.label)"
                         ></es-label>
                         <span v-if="item.text || item.type === 'text'">{{
                           item.text || item.contents
@@ -249,16 +247,7 @@
                         v-if="
                           item.showLabel !== false && item.label && showLabel
                         "
-                        :contents="item.label"
-                        v-bind="
-                          item.label
-                            ? {
-                                event: item.label.event,
-                                events: item.label.events
-                              }
-                            : {}
-                        "
-                        :plain="item.plain || item.name === undefined"
+                        v-bind="getLabel(item.label)"
                       ></es-label>
                       <es-input-number
                         v-if="item.type == 'number'"
@@ -1209,16 +1198,7 @@
                   <es-label
                     slot="label"
                     v-if="item.showLabel !== false && item.label && showLabel"
-                    :contents="item.label"
-                    v-bind="
-                      item.label
-                        ? {
-                            event: item.label.event,
-                            events: item.label.events
-                          }
-                        : {}
-                    "
-                    :plain="item.plain || item.name === undefined"
+                    v-bind="getLabel(item.label)"
                   ></es-label>
                   <es-input-number
                     v-if="item.type == 'number'"
@@ -2026,9 +2006,7 @@
                     <div v-else :key="index" class="es-collapse-title-handler">
                       <es-label
                         v-if="item.label"
-                        :contents="item.label"
-                        :event="item.label.event"
-                        :events="item.label.events"
+                        v-bind="getLabel(item.label)"
                       ></es-label>
                       <span v-if="item.text || item.type === 'text'">{{
                         item.text || item.contents
@@ -2191,16 +2169,7 @@
                     <es-label
                       slot="label"
                       v-if="item.showLabel !== false && item.label && showLabel"
-                      :contents="item.label"
-                      v-bind="
-                        item.label
-                          ? {
-                              event: item.label.event,
-                              events: item.label.events
-                            }
-                          : {}
-                      "
-                      :plain="item.plain || item.name === undefined"
+                      v-bind="getLabel(item.label)"
                     ></es-label>
                     <es-input-number
                       v-if="item.type == 'number'"
@@ -3102,16 +3071,7 @@
                 <es-label
                   slot="label"
                   v-if="item.showLabel !== false && item.label && showLabel"
-                  :contents="item.label"
-                  v-bind="
-                    item.label
-                      ? {
-                          event: item.label.event,
-                          events: item.label.events
-                        }
-                      : {}
-                  "
-                  :plain="item.plain || item.name === undefined"
+                  v-bind="getLabel(item.label)"
                 ></es-label>
                 <es-input-number
                   v-if="item.type == 'number'"
@@ -4403,6 +4363,11 @@ export default {
     });
   },
   methods: {
+    getLabel(res) {
+      return typeof res === 'string'
+        ? { contents: res }
+        : { ...res, plain: res.plain || res.name === undefined };
+    },
     getHeight() {
       if (
         util.hasClass(this.$parent.$el, 'el-dialog__wrapper') ||

package/packages/form/src/table.vue

@@ -111,17 +111,7 @@
               >
                 <es-label
                   v-if="item.showLabel !== false && item.label"
-                  :contents="item.label"
-                  v-bind="
-                    item.label
-                      ? {
-                          event: item.label.event,
-                          events: item.label.events
-                        }
-                      : {}
-                  "
-                  :plain="item.plain"
-                  :rules="item.rules"
+                  v-bind="getLabel(item.label)"
                 ></es-label>
               </td>
               <td
@@ -1233,6 +1223,11 @@ export default {
     this.getWidth();
   },
   methods: {
+    getLabel(res) {
+      return typeof res === 'string'
+        ? { contents: res }
+        : { ...res, plain: res.plain || res.name === undefined };
+    },
     getRules(res) {
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {

package/packages/main/src/main.vue

@@ -253,7 +253,7 @@ import message from './message.vue';
 import notice from './notice.vue';
 import AsyncComponent from './async-component/index.vue';
 import {
-  authCenter,
+  //authCenter,
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
@@ -628,7 +628,7 @@ export default {
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
-    this.isLogin(params);
+    this.getConfig(params);
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -643,153 +643,6 @@ export default {
     util.win.windowOpen = this.openPage;
   },
   methods: {
-    async isLogin(query) {
-      const token =
-        util.getStorage('token') || util.getStorage('Authorization');
-
-      let loginPage = util.getStorage('login') || util.getStorage('loginPage');
-      if (loginPage) {
-        if (!util.startWith(loginPage, ['http', '/'], true)) {
-          let pathname = util.win.top.location.pathname;
-          if (pathname !== '/') {
-            pathname = pathname.split('/');
-            pathname.splice(pathname.length - 1);
-            pathname = pathname.join('/');
-            loginPage = pathname + '/' + loginPage.replace('./', '');
-          } else {
-            loginPage = pathname + loginPage.replace('./', '');
-          }
-        }
-      }
-      if (
-        !token &&
-        query &&
-        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
-        Object.prototype.hasOwnProperty.call(query, 'authType')
-      ) {
-        await util
-          .ajax({
-            method: 'post',
-            url: authCenter,
-            data: query
-          })
-          .then((res) => {
-            if (res.rCode === 0) {
-              let { results } = res;
-              switch (results.statusCode) {
-                case 0:
-                  util.setStorage({
-                    type: this.storage,
-                    key: {
-                      ssId: results.ssId,
-                      token: results.token,
-                      Authorization: results.token,
-                      deviceUnique: results.deviceUnique
-                    }
-                  });
-                  if (query.openType) {
-                    let url = util.win.top.location.href;
-                    let newUrl = util.delUrlParam({
-                      url: url,
-                      key: ['serverId', 'authType', 'openType']
-                    });
-                    switch (query.openType) {
-                      case 'self':
-                        util.win.location.href = newUrl;
-                        break;
-                      case 'blank':
-                        util.win.open(newUrl);
-                        break;
-                      case 'parent':
-                        util.win.parent.location.href = href;
-                        break;
-                      default:
-                        util.win.top.location.href = href;
-                    }
-                  } else {
-                    this.getConfig();
-                  }
-                  break;
-                case 1:
-                  break;
-                case 2:
-                  break;
-                case 3:
-                  const href = results.authorizeUrl.replace(
-                    '{redirectUri}',
-                    encodeURIComponent(url)
-                  );
-                  switch (query.openType) {
-                    case 'self':
-                      util.win.location.href = href;
-                      break;
-                    case 'blank':
-                      util.win.open(href);
-                      break;
-                    case 'parent':
-                      util.win.parent.location.href = href;
-                      break;
-                    default:
-                      util.win.top.location.href = href;
-                  }
-                  break;
-                case 4:
-                  this.$alert(
-                    results.msg
-                      ? results.msg
-                      : '账号未绑定，账号密码登录后自动绑定！',
-                    '提示',
-                    {
-                      confirmButtonText: '确定',
-                      type: 'error',
-                      callback: () => {
-                        sessionStorage.setItem(
-                          'extUserBindHandleId',
-                          results.extUserBindHandleId
-                        );
-                        //window.location.href = delUrlParam({ key: 'code' });
-                        if (loginPage) {
-                          util.win.top.location.replace(loginPage);
-                        } else if (document.referrer) {
-                          util.win.top.location.replace(document.referrer);
-                        } else if (
-                          util.win.top.location.href.indexOf('main.html') > -1
-                        ) {
-                          util.win.top.location.href = './login.html';
-                        } else {
-                          this.$router.replace('/login');
-                        }
-                      }
-                    }
-                  );
-                  break;
-                default:
-              }
-            } else {
-              this.$alert(res.msg, '提示', {
-                confirmButtonText: '确定',
-                type: 'error',
-                callback: () => {
-                  if (loginPage) {
-                    util.win.top.location.replace(loginPage);
-                  } else if (document.referrer) {
-                    util.win.top.location.replace(document.referrer);
-                  } else if (
-                    util.win.top.location.href.indexOf('main.html') > -1
-                  ) {
-                    util.win.top.location.href = './login.html';
-                  } else {
-                    this.$router.replace('/login');
-                  }
-                }
-              });
-            }
-          })
-          .catch((e) => {});
-      } else {
-        this.getConfig();
-      }
-    },
     menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
@@ -1055,7 +908,16 @@ export default {
       }
     },
     //获取用户配置及信息
-    getConfig() {
+    getConfig(query) {
+      const token =
+        util.getStorage('token') || util.getStorage('Authorization');
+      if (
+        !token &&
+        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
+        Object.prototype.hasOwnProperty.call(query, 'authType')
+      ) {
+        return false;
+      }
       if (util.getStorage('mainConfig')) {
         const results = JSON.parse(util.getStorage('mainConfig'));
         this.setConfig(results);

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

@@ -175,11 +175,7 @@ export default {
       return this.options ? this.options : this.data;
     },
     labelVal() {
-      if (
-        this.readonly &&
-        (this.model || this.model === 0) &&
-        this.results.length
-      ) {
+      if (this.readonly && this.model !== undefined && this.results.length) {
         if (typeof this.model !== 'object') {
           if (util.isObject(this.results[0])) {
             let val;