eoss-ui 0.3.97 → 0.4.10

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

@@ -80,12 +80,22 @@
               "
               @blur="
                 event => {
-                  handleBlur({ item: item, event: event, data: scope.row });
+                  handleBlur({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @focus="
                 event => {
-                  handleFocus({ item: item, event: event, data: scope.row });
+                  handleFocus({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @change="
@@ -94,7 +104,8 @@
                     item: item,
                     name: item.field || item.prop,
                     value: value,
-                    data: scope.row
+                    data: scope.row,
+                    scope: scope
                   });
                 }
               "
@@ -112,12 +123,22 @@
               "
               @blur="
                 event => {
-                  handleBlur({ item: item, event: event, data: scope.row });
+                  handleBlur({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @focus="
                 event => {
-                  handleFocus({ item: item, event: event, data: scope.row });
+                  handleFocus({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @change="
@@ -126,7 +147,8 @@
                     item: item,
                     name: item.field || item.prop,
                     value: value,
-                    data: scope.row
+                    data: scope.row,
+                    scope: scope
                   });
                 }
               "
@@ -251,12 +273,22 @@
               v-model="scope.row[item.field]"
               @blur="
                 event => {
-                  handleBlur({ item: item, event: event, data: scope.row });
+                  handleBlur({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @focus="
                 event => {
-                  handleFocus({ item: item, event: event, data: scope.row });
+                  handleFocus({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @change="
@@ -265,7 +297,8 @@
                     item: item,
                     name: item.field || item.prop,
                     value: value,
-                    data: scope.row
+                    data: scope.row,
+                    scope: scope
                   });
                 }
               "
@@ -276,12 +309,22 @@
               v-model="scope.row[item.field]"
               @blur="
                 event => {
-                  handleBlur({ item: item, event: event, data: scope.row });
+                  handleBlur({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @focus="
                 event => {
-                  handleFocus({ item: item, event: event, data: scope.row });
+                  handleFocus({
+                    item: item,
+                    event: event,
+                    data: scope.row,
+                    scope: scope
+                  });
                 }
               "
               @change="
@@ -290,7 +333,8 @@
                     item: item,
                     name: item.field || item.prop,
                     value: value,
-                    data: scope.row
+                    data: scope.row,
+                    scope: scope
                   });
                 }
               "
@@ -321,7 +365,12 @@
                   v-model.lazy="scope.row[item.field]"
                   @blur="
                     event => {
-                      handleBlur({ item: item, event: event, data: scope.row });
+                      handleBlur({
+                        item: item,
+                        event: event,
+                        data: scope.row,
+                        scope: scope
+                      });
                     }
                   "
                   @focus="
@@ -329,7 +378,8 @@
                       handleFocus({
                         item: item,
                         event: event,
-                        data: scope.row
+                        data: scope.row,
+                        scope: scope
                       });
                     }
                   "
@@ -339,7 +389,8 @@
                         item: item,
                         name: item.field || item.prop,
                         value: value,
-                        data: scope.row
+                        data: scope.row,
+                        scope: scope
                       });
                     }
                   "
@@ -351,7 +402,12 @@
                   v-model.lazy="scope.row[item.field]"
                   @blur="
                     event => {
-                      handleBlur({ item: item, event: event, data: scope.row });
+                      handleBlur({
+                        item: item,
+                        event: event,
+                        data: scope.row,
+                        scope: scope
+                      });
                     }
                   "
                   @focus="
@@ -359,7 +415,8 @@
                       handleFocus({
                         item: item,
                         event: event,
-                        data: scope.row
+                        data: scope.row,
+                        scope: scope
                       });
                     }
                   "
@@ -369,7 +426,8 @@
                         item: item,
                         name: item.field || item.prop,
                         value: value,
-                        data: scope.row
+                        data: scope.row,
+                        scope: scope
                       });
                     }
                   "
@@ -381,12 +439,22 @@
                 v-model="scope.row[item.field]"
                 @blur="
                   event => {
-                    handleBlur({ item: item, event: event, data: scope.row });
+                    handleBlur({
+                      item: item,
+                      event: event,
+                      data: scope.row,
+                      scope: scope
+                    });
                   }
                 "
                 @focus="
                   event => {
-                    handleFocus({ item: item, event: event, data: scope.row });
+                    handleFocus({
+                      item: item,
+                      event: event,
+                      data: scope.row,
+                      scope: scope
+                    });
                   }
                 "
                 @change="
@@ -395,7 +463,8 @@
                       item: item,
                       name: item.field || item.prop,
                       value: value,
-                      data: scope.row
+                      data: scope.row,
+                      scope: scope
                     });
                   }
                 "

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

@@ -37,7 +37,7 @@
           ref="tableSelect"
           :style="style"
           :data="options[item.field || item.prop]"
-          @hideMenu="selectShow = false"
+          @hide-menu="selectShow = false"
           @change="
             value => {
               handleChange('date', value);

package/packages/login/src/main.vue

@@ -507,7 +507,7 @@ export default {
       if (this.redirect_uri) {
         return this.redirect_uri;
       } else {
-        return util.win.top.location.href || window.href;
+        return window.location.href || window.href;
       }
     },
     loginBackgroundUrl() {
@@ -550,6 +550,7 @@ export default {
       return types.length > 2
         ? {
             '0': { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
+            '1': { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
             '3': { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
             '6': { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             '7': { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -558,6 +559,7 @@ export default {
           }
         : {
             '0': { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
+            '1': { type: '1', icon: 'es-icon-ca', name: '证书登录' },
             '3': { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
             '6': { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             '7': { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -1009,15 +1011,19 @@ export default {
       }
     },
     handleUserLogin(data) {
+      let extUserBindHandleId = sessionStorage.getItem('extUserBindHandleId');
       util
         .ajax({
           method: 'post',
           url: this.active == '0' ? this.actionUrl : this.doCodeLogin,
-          data: data
+          data: extUserBindHandleId
+            ? { ...data, extUserBindHandleId: extUserBindHandleId }
+            : data
         })
         .then(res => {
           this.submit = false;
           if (res.rCode == 0) {
+            sessionStorage.removeItem('extUserBindHandleId');
             this.handleRemember();
             const results = res.results;
             this.handleResults(results);
@@ -1108,12 +1114,12 @@ export default {
             duration: 1500,
             onClose: () => {
               if (this.toUrl) {
-                util.win.location.href = this.toUrl;
+                window.location.href = this.toUrl;
               } else if (results.doorIndex && this.doorIndex) {
-                util.win.location.href = results.doorIndex;
+                window.location.href = results.doorIndex;
               } else {
-                if (util.win.top.location.href.indexOf('login.html') > -1) {
-                  util.win.top.location.href = './main.html';
+                if (window.location.href.indexOf('login.html') > -1) {
+                  window.location.href = './main.html';
                 } else {
                   this.$router.push({ name: 'main' });
                 }
@@ -1145,25 +1151,46 @@ export default {
           let url =
             results.doorIndex && this.doorIndex
               ? results.doorIndex
-              : util.win.top.location.href.indexOf('main.html') > -1
+              : window.location.href.indexOf('main.html') > -1
               ? './login.html'
-              : util.win.location.hash
-              ? util.win.location.href.replace('login', 'main')
-              : util.win.location.href;
+              : window.location.hash
+              ? window.location.href.replace('login', 'main')
+              : window.location.href;
           const href = results.authorizeUrl.replace(
             '{redirectUri}',
             encodeURIComponent(url)
           );
-          util.win.top.location.href = href;
-          // util.win.location.href =
+          window.location.href = href;
+          // window.location.href =
           //   results.authorizeUrl.indexOf('?') > -1
           //     ? results.authorizeUrl + '&token=' + results.token
           //     : results.authorizeUrl + '?token=' + results.token;
           break;
+        case 4:
+          this.$alert(
+            results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！',
+            '提示',
+            {
+              confirmButtonText: '确定',
+              type: 'error'
+            }
+          )
+            .then(() => {
+              sessionStorage.setItem(
+                'extUserBindHandleId',
+                results.extUserBindHandleId
+              );
+              window.location.href = util.delUrlParam({ key: 'code' });
+              if (window.location.hash) {
+                location.reload();
+              }
+            })
+            .catch(e => {});
+          break;
         default:
           if (type !== 3) {
             this.$message({
-              message: results.msg || res.msg,
+              message: results.msg,
               type: 'error',
               duration: 1500,
               onClose: () => {

package/packages/radio-group/index.js

@@ -1,6 +1,6 @@
-import EsRadio from './src/main';
+import EsRadioGroup from './src/main';
 
 /* istanbul ignore next */
-EsRadio.install = function(Vue) {Vue.component(EsRadio.name, EsRadio);};
+EsRadioGroup.install = function(Vue) {Vue.component(EsRadioGroup.name, EsRadioGroup);};
 
-export default EsRadio;
+export default EsRadioGroup;

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

@@ -97,7 +97,10 @@ export default {
     },
     valueType: {
       type: String,
-      default: 'string'
+      default: 'string',
+      validator: function(value) {
+        return ['string', 'object'].includes(value);
+      }
     },
     valueKey: {
       type: String,

package/packages/select/src/main.vue

@@ -33,7 +33,13 @@ export default {
       type: Boolean,
       default: false
     },
-    valueType: String,
+    valueType: {
+      type: String,
+      default: 'string',
+      validator: function(value) {
+        return ['string', 'object'].includes(value);
+      }
+    },
     // 选择项的值字段
     valueKey: {
       type: String,

package/packages/select-ganged/src/main.vue

@@ -37,7 +37,10 @@ export default {
     },
     valueType: {
       type: String,
-      default: 'object'
+      default: 'object',
+      validator: function(value) {
+        return ['string', 'object'].includes(value);
+      }
     },
     data: {
       type: Array,

package/packages/selector/src/main.vue

@@ -248,7 +248,10 @@ export default {
     },
     valueType: {
       type: String,
-      default: 'object'
+      default: 'object',
+      validator: function(value) {
+        return ['string', 'object'].includes(value);
+      }
     },
     size: String,
     id: String,

package/packages/selector-panel/src/selection.vue

@@ -63,7 +63,10 @@ export default {
     },
     valueType: {
       type: String,
-      default: 'object'
+      default: 'object',
+      validator: function(value) {
+        return ['string', 'object'].includes(value);
+      }
     },
     data: {
       type: Array,