eoss-ui 0.5.69 → 0.5.71

package/lib/wxlogin.js

@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.69",
+  "version": "0.5.71",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.97",
+    "eoss-element": "^0.2.98",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -55,6 +55,7 @@
 
 <script>
 import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
@@ -239,12 +240,17 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getData = debounce(500, (url, sysCode) => {
+      this.getDatas(url, sysCode);
+    });
+  },
   created() {
     this.bindEventBus();
   },
   mounted() {},
   methods: {
-    getData(url, sysCode) {
+    getDatas(url, sysCode) {
       let params = {};
       if (this.results.length === 0) {
         params = util.extend(

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

@@ -721,10 +721,12 @@ export default {
       }
     }
   },
-  created() {
-    this.getTableData = debounce(300, (res) => {
+  beforeCreate() {
+    this.getTableData = debounce(500, (res) => {
       this.getTableDatas(res);
     });
+  },
+  created() {
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
     }

package/packages/dialog/src/main.vue

@@ -10,13 +10,11 @@
     :drag="drag"
     :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
-    v-on="$listeners"
+    v-on="{ ...$listeners, close: handleClosed, scale: handleScale }"
     :class="{ 'is-middle': middle }"
     :append-to-body="appendToBody"
     :id="wujieName"
     :ref="wujieName"
-    @close="handleClosed"
-    @scale="handleScale"
   >
     <slot></slot>
     <template v-if="contents">
@@ -449,6 +447,7 @@ export default {
       this.show = false;
       this.$emit('close', res, this);
       if (this.closeParent && this.esDialog) {
+        console.log(12121);
         this.esDialog.handleClosed(res);
       }
     },

package/packages/form/src/main.vue

@@ -4002,6 +4002,7 @@
 </template>
 <script>
 import { formContents } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 import rules from 'eoss-ui/src/utils/rules.js';
 export default {
@@ -4506,6 +4507,14 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getContent = debounce(500, () => {
+      this.getContents();
+    });
+    this.getValue = debounce(500, () => {
+      this.getValues();
+    });
+  },
   created() {
     this.dialog =
       window.$wujie && window.$wujie.props
@@ -4548,7 +4557,7 @@ export default {
       }
       return this.getParentHeight(dom.parentNode);
     },
-    getContent() {
+    getContents() {
       if (
         typeof this.contents === 'string' ||
         (util.isObject(this.contents) &&
@@ -4649,7 +4658,7 @@ export default {
         }
       }
     },
-    getValue() {
+    getValues() {
       if (typeof this.model === 'string') {
         this.loading = true;
         let param = this.paramId

package/packages/input/src/main.vue

@@ -1,4 +1,5 @@
 <script>
+import { debounce } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 import rules from 'eoss-ui/src/utils/rules.js';
 export default {
@@ -127,9 +128,15 @@ export default {
       return undefined;
     }
   },
+  beforeCreate() {
+    this.getData = debounce(500, (query, callback, isChange) => {
+      this.getDatas(query, callback, isChange);
+    });
+  },
+  created() {},
   mounted() {},
   methods: {
-    getData(query, callback, isChange) {
+    getDatas(query, callback, isChange) {
       if (typeof this.url && this.results.length === 0) {
         util
           .ajax({

package/packages/login/src/main.vue

@@ -30,7 +30,7 @@
           <i
             v-for="(item, index) in icons"
             v-show="switchs > 2 || active != item.type"
-            @click="switchLogin(item.type)"
+            @click="switchLogin(item)"
             :title="switchs > 2 ? item.name : ''"
             :key="index"
             :class="[
@@ -378,10 +378,6 @@ export default {
       type: String,
       default: 'default'
     },
-    title: {
-      type: String,
-      default: '账号登录'
-    },
     param: {
       type: Object,
       default() {
@@ -635,11 +631,7 @@ export default {
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            11: {
-              type: '11',
-              icon: 'es-icon-wodeyouxiang',
-              name: '邮箱登录'
-            },
+            11: { type: '11', icon: 'es-icon-wodeyouxiang', name: '邮箱登录' },
             12: { type: '12', icon: 'es-icon-jianpan', name: '账号登录' } //双因素
           };
     },
@@ -671,6 +663,7 @@ export default {
       immediate: true,
       handler(val) {
         this.active = val.split(',')[0];
+        this.title = this.iconfonts[this.active].name;
       }
     },
     active: {
@@ -719,6 +712,7 @@ export default {
   },
   data() {
     return {
+      title: '',
       align: this.position,
       loginBackgroundImg: this.loginBackground,
       loginMainImg: this.loginImage,
@@ -789,12 +783,17 @@ export default {
       document.addEventListener('keyup', this.doLogin);
       document.addEventListener('keydown', this.forbiddenTab);
     }
+    this.init();
   },
   mounted() {
     this.getRemember();
     delete util.win.websocket;
   },
   methods: {
+    init() {
+      let loginBoxAlign = localStorage.getItem('loginBoxAlign');
+      loginBoxAlign && (this.align = loginBoxAlign);
+    },
     doWechatLogin(code) {
       util
         .ajax({
@@ -948,7 +947,8 @@ export default {
       //this.$refs.login && this.$refs.login.resetFields();
       this.$refs.login && this.$refs.login.clearValidate();
       if (res != 1) {
-        this.active = res;
+        this.active = res.type;
+        this.title = res.name;
         Object.keys(this.defaultModel).length &&
           (this.formData = JSON.parse(JSON.stringify(this.defaultModel)));
       }
@@ -1050,6 +1050,10 @@ export default {
           this.loginNameImg = res.subsystemExtend.loginBoxName;
         }
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
+          localStorage.setItem(
+            'loginBoxAlign',
+            res.subsystemExtend.loginBoxAlign
+          );
           this.align = res.subsystemExtend.loginBoxAlign;
         }
         if (res.subsystemExtend.copyrightColor) {

package/packages/menu/src/main.vue

@@ -78,11 +78,12 @@ export default {
       isChange: false
     };
   },
-  created() {
-    this.getMaxWidth = debounce(300, () => {
+  beforeCreate() {
+    this.getMaxWidth = debounce(500, () => {
       this.getWidth();
     });
   },
+  created() {},
   mounted() {
     this.getMaxWidth();
   },

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

@@ -56,6 +56,7 @@
 
 <script>
 import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
@@ -228,12 +229,17 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getData = debounce(500, (url, sysCode) => {
+      this.getDatas(url, sysCode);
+    });
+  },
   created() {
     this.bindEventBus();
   },
   mounted() {},
   methods: {
-    getData(url, sysCode) {
+    getDatas(url, sysCode) {
       let params = {};
       if (this.results.length === 0) {
         params = util.extend(

package/packages/select/src/main.vue

@@ -1,5 +1,6 @@
 <script>
 import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
@@ -72,10 +73,6 @@ export default {
     remoteMethod: Function,
     // 选择项远程地址
     url: String,
-    wait: {
-      type: Boolean,
-      default: true
-    },
     // 选择项获取代码表数据(优先级大于url)
     sysCode: String,
     filtrate: [String, Object, Array],
@@ -203,6 +200,7 @@ export default {
       immediate: true,
       handler(val, old) {
         if (val && val !== old) {
+          console.log(1);
           this.label = this.service ? 'label' : 'shortName';
           this.valKey = this.service ? 'value' : 'cciValue';
           const options = store.get(val);
@@ -224,6 +222,7 @@ export default {
     param: {
       deep: true,
       handler(val, old) {
+        console.log(3);
         if (this.url && JSON.stringify(val) !== JSON.stringify(old)) {
           this.options = [];
           this.getData(this.sysCode);
@@ -231,14 +230,15 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getData = debounce(500, (sysCode, param, reload) => {
+      this.getDatas(sysCode, param, reload);
+    });
+  },
   created() {
     this.bindEventBus();
   },
-  mounted() {
-    if (this.wait) {
-      this.getData();
-    }
-  },
+  mounted() {},
   methods: {
     createOption({ filtrate, data, readonly = false, h }) {
       let filte =
@@ -327,7 +327,7 @@ export default {
       });
       return eles;
     },
-    getData(sysCode, param, reload) {
+    getDatas(sysCode, param, reload) {
       if (
         !reload &&
         (!this.ajax ||

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

@@ -1,5 +1,6 @@
 <script>
 import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsSelectGanged',
@@ -233,12 +234,17 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getData = debounce(500, () => {
+      this.getDatas();
+    });
+  },
   created() {
     this.getData();
   },
   mounted() {},
   methods: {
-    getData() {
+    getDatas() {
       if (!this.integrality || !this.url) {
         return false;
       }

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

@@ -109,6 +109,7 @@ import {
   getSelectorOrgTree,
   getSelectorOrgDetail
 } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util.js';
 export default {
   name: 'EsSelectorPanel',
@@ -601,12 +602,17 @@ export default {
       this.trees[this.activeName].value = val;
     }
   },
+  beforeCreate() {
+    this.ajaxActive = debounce(500, (active) => {
+      this.getAjaxActive(active);
+    });
+  },
   created() {},
   mounted() {
     this.ajaxActive(this.activeName);
   },
   methods: {
-    ajaxActive(active) {
+    getAjaxActive(active) {
       if (this.isShowTree) {
         if (
           (!this.trees[active].data ||

package/packages/steps/src/main.vue

@@ -66,6 +66,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util.js';
+import { debounce } from 'throttle-debounce';
 export default {
   name: 'EsSteps',
   inheritAttrs: false,
@@ -128,12 +129,17 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getData = debounce(500, () => {
+      this.getDatas();
+    });
+  },
   created() {
     this.getData();
   },
   mounted() {},
   methods: {
-    getData() {
+    getDatas() {
       if (this.url) {
         let param = this.param ? this.param : {};
         util
@@ -143,7 +149,7 @@ export default {
             data: param,
             params: param
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               if (this.esForm) {
                 this.esForm.stepContent = JSON.parse(
@@ -154,7 +160,7 @@ export default {
               }
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }