eoss-ui 0.5.60 → 0.5.62

package/lib/upload.js

@@ -369,7 +369,7 @@ var ajax = function ajax(_ref) {
             error.message = '未授权，请重新登录';
             break;
           case 403:
-            error.message = '登录过期，请重新登录';
+            error.message = '服务器错误';
             break;
           case 404:
             error.message = '网络请求不存在';
@@ -381,7 +381,7 @@ var ajax = function ajax(_ref) {
             error.message = '请求超时';
             break;
           case 500:
-            error.message = '服务器端出错';
+            error.message = '服务器错误';
             break;
           case 501:
             error.message = '网络未实现';
@@ -737,18 +737,23 @@ var dayOfMonth = function dayOfMonth(date) {
  * @desc:添加js内容
  * @author huangbo
  * @date 2022年5月7日
- * @param {Function} [fn] - 函数
+ * @param {Function} [callback] - 函数
  * @param {Number} [wait] - 延迟毫秒数
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(callback, delay) {
-  var timeout = null;
+var debounce = function debounce(callback, wait) {
+  var timeout = void 0;
   return function () {
-    clearTimeout(timeout);
-    timeout = setTimeout(callback, delay ? delay : 500);
+    var context = this;
+    var args = arguments;
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(function () {
+      callback.apply(context, args);
+    }, wait || 500);
   };
 };
+
 /**
  * delUrlParam
  * @desc:删除url指定参数
@@ -2885,7 +2890,8 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color ? color : '#409eff';
+  color = color && startWith(color, '#') ? color : '#409eff';
+
   if (send === undefined) {
     send = true;
   }
@@ -3797,13 +3803,13 @@ window.__store = store;
 /* 22 */,
 /* 23 */,
 /* 24 */,
-/* 25 */
+/* 25 */,
+/* 26 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
-/* 26 */,
 /* 27 */,
 /* 28 */,
 /* 29 */,
@@ -4233,7 +4239,7 @@ var util = __webpack_require__(0);
 var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(25);
+var external_js_base64_ = __webpack_require__(26);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

package/lib/utils/util.js

@@ -287,7 +287,7 @@ var ajax = function ajax(_ref) {
             error.message = '未授权，请重新登录';
             break;
           case 403:
-            error.message = '登录过期，请重新登录';
+            error.message = '服务器错误';
             break;
           case 404:
             error.message = '网络请求不存在';
@@ -299,7 +299,7 @@ var ajax = function ajax(_ref) {
             error.message = '请求超时';
             break;
           case 500:
-            error.message = '服务器端出错';
+            error.message = '服务器错误';
             break;
           case 501:
             error.message = '网络未实现';
@@ -655,18 +655,23 @@ var dayOfMonth = function dayOfMonth(date) {
  * @desc:添加js内容
  * @author huangbo
  * @date 2022年5月7日
- * @param {Function} [fn] - 函数
+ * @param {Function} [callback] - 函数
  * @param {Number} [wait] - 延迟毫秒数
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(callback, delay) {
-  var timeout = null;
+var debounce = function debounce(callback, wait) {
+  var timeout = void 0;
   return function () {
-    clearTimeout(timeout);
-    timeout = setTimeout(callback, delay ? delay : 500);
+    var context = this;
+    var args = arguments;
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(function () {
+      callback.apply(context, args);
+    }, wait || 500);
   };
 };
+
 /**
  * delUrlParam
  * @desc:删除url指定参数
@@ -2803,7 +2808,8 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color ? color : '#409eff';
+  color = color && startWith(color, '#') ? color : '#409eff';
+
   if (send === undefined) {
     send = true;
   }

package/lib/wujie.js

@@ -370,7 +370,7 @@ var ajax = function ajax(_ref) {
             error.message = '未授权，请重新登录';
             break;
           case 403:
-            error.message = '登录过期，请重新登录';
+            error.message = '服务器错误';
             break;
           case 404:
             error.message = '网络请求不存在';
@@ -382,7 +382,7 @@ var ajax = function ajax(_ref) {
             error.message = '请求超时';
             break;
           case 500:
-            error.message = '服务器端出错';
+            error.message = '服务器错误';
             break;
           case 501:
             error.message = '网络未实现';
@@ -738,18 +738,23 @@ var dayOfMonth = function dayOfMonth(date) {
  * @desc:添加js内容
  * @author huangbo
  * @date 2022年5月7日
- * @param {Function} [fn] - 函数
+ * @param {Function} [callback] - 函数
  * @param {Number} [wait] - 延迟毫秒数
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(callback, delay) {
-  var timeout = null;
+var debounce = function debounce(callback, wait) {
+  var timeout = void 0;
   return function () {
-    clearTimeout(timeout);
-    timeout = setTimeout(callback, delay ? delay : 500);
+    var context = this;
+    var args = arguments;
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(function () {
+      callback.apply(context, args);
+    }, wait || 500);
   };
 };
+
 /**
  * delUrlParam
  * @desc:删除url指定参数
@@ -2886,7 +2891,8 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color ? color : '#409eff';
+  color = color && startWith(color, '#') ? color : '#409eff';
+
   if (send === undefined) {
     send = true;
   }

package/lib/wxlogin.js

@@ -370,7 +370,7 @@ var ajax = function ajax(_ref) {
             error.message = '未授权，请重新登录';
             break;
           case 403:
-            error.message = '登录过期，请重新登录';
+            error.message = '服务器错误';
             break;
           case 404:
             error.message = '网络请求不存在';
@@ -382,7 +382,7 @@ var ajax = function ajax(_ref) {
             error.message = '请求超时';
             break;
           case 500:
-            error.message = '服务器端出错';
+            error.message = '服务器错误';
             break;
           case 501:
             error.message = '网络未实现';
@@ -738,18 +738,23 @@ var dayOfMonth = function dayOfMonth(date) {
  * @desc:添加js内容
  * @author huangbo
  * @date 2022年5月7日
- * @param {Function} [fn] - 函数
+ * @param {Function} [callback] - 函数
  * @param {Number} [wait] - 延迟毫秒数
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(callback, delay) {
-  var timeout = null;
+var debounce = function debounce(callback, wait) {
+  var timeout = void 0;
   return function () {
-    clearTimeout(timeout);
-    timeout = setTimeout(callback, delay ? delay : 500);
+    var context = this;
+    var args = arguments;
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(function () {
+      callback.apply(context, args);
+    }, wait || 500);
   };
 };
+
 /**
  * delUrlParam
  * @desc:删除url指定参数
@@ -2886,7 +2891,8 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color ? color : '#409eff';
+  color = color && startWith(color, '#') ? color : '#409eff';
+
   if (send === undefined) {
     send = true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.60",
+  "version": "0.5.62",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -67,6 +67,7 @@
     "sm-crypto": "^0.3.11",
     "sockjs-client": "^1.6.1",
     "stompjs": "^2.3.3",
+    "throttle-debounce": "^5.0.2",
     "video.js": "^8.0.4",
     "wujie-vue2": "^1.0.18"
   },
@@ -96,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.91",
+    "eoss-element": "^0.2.93",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -1,43 +1,68 @@
 <template>
   <el-button-group class="es-button-group">
-    <template v-for="(item, index) in btns">
-      <es-button
-        v-if="item && !item.hide"
-        :stop="stop"
-        v-bind="item"
-        :key="index"
-        :size="size"
-        :type="item.type"
-        @click="handleClick({ ...data, handle: item })"
-      >
-        {{
-          item.template ? item.template({ ...data, config: item }) : item.text
-        }}
-      </es-button>
-      <el-dropdown
-        v-if="other.length > 0 && index == btns.length - 1"
-        @command="handleCommand"
-        :trigger="trigger"
-      >
-        <el-button :size="size">
-          <i class="es-icon-omit"></i>
-        </el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            v-for="(item, index) in other"
+    <template v-if="length > 1">
+      <template v-for="(item, index) in showBtns">
+        <template v-if="item && !item.hide">
+          <es-upload
+            v-if="item.upload || (item.code && item.ownId)"
+            class="el-button"
+            v-bind="{
+              ...item,
+              method: 'post',
+              btnSize: size,
+              showFileList: false,
+              selectType: item.type ? item.type : ''
+            }"
+          ></es-upload>
+          <es-button
+            v-else
+            :stop="stop"
+            v-bind="item"
             :key="index"
-            :command="item"
+            :size="size"
+            :type="item.type"
+            @click="handleClick({ ...data, handle: item })"
           >
-            <i :class="item.icon" v-if="item.icon"></i
-            >{{
+            {{
               item.template
                 ? item.template({ ...data, config: item })
                 : item.text
-            }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
+            }}
+          </es-button>
+        </template>
+      </template>
     </template>
+    <el-dropdown
+      v-if="other.length > 0"
+      @command="handleCommand"
+      @visible-change="handleChange"
+      :trigger="trigger"
+    >
+      <el-button :size="size">
+        <template v-if="moreText">
+          {{ moreText }}
+          <i
+            :class="{
+              'el-icon-arrow-down': !show,
+              'el-icon-arrow-up': show
+            }"
+          ></i>
+        </template>
+        <i v-else class="es-icon-omit"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item
+          v-for="(item, index) in other"
+          :key="index"
+          :command="item"
+        >
+          <i :class="item.icon" v-if="item.icon"></i
+          >{{
+            item.template ? item.template({ ...data, config: item }) : item.text
+          }}</el-dropdown-item
+        >
+      </el-dropdown-menu>
+    </el-dropdown>
   </el-button-group>
 </template>
 <script>
@@ -63,22 +88,32 @@ export default {
       type: String,
       default: 'click'
     },
-    useCaseCodeKey: String
+    useCaseCodeKey: String,
+    moreText: String,
+    size: {
+      type: String,
+      default: 'mini'
+    }
   },
   computed: {
     btns() {
       return this.getBtns();
     },
+    showBtns() {
+      return this.btns.slice(0, this.length - 1);
+    },
     other() {
-      return this.length > 0 && this.btns.length > this.length
-        ? this.btns.splice(this.length - 1, this.btns.length)
-        : [];
+      let btns =
+        this.length > 0 && (this.btns.length > this.length || this.length == 1)
+          ? this.btns.slice(this.length - 1, this.btns.length)
+          : [];
+      return btns;
     }
   },
   watch: {},
   data() {
     return {
-      size: 'mini'
+      show: false
     };
   },
   mounted() {
@@ -117,6 +152,9 @@ export default {
       });
       return arry;
     },
+    handleChange(res) {
+      this.show = res;
+    },
     handleClick(obj) {
       this.$emit('handleClick', obj);
       this.$emit('handle-click', obj);

package/packages/calendar/src/main.vue

@@ -60,7 +60,7 @@
 
 <script>
 export default {
-  name: 'esCalendar',
+  name: 'EsCalendar',
   props: {
     //显示title
     showTitle: {

package/packages/card/src/main.vue

@@ -9,19 +9,19 @@
         <slot name="header">
           <template v-if="header">
             <template v-if="isObject">
-              <i
+              <es-icon
                 v-if="header.icon"
                 class="es-header-icon"
-                :class="header.icon"
-              ></i>
+                :contents="header.icon"
+              ></es-icon>
               <span v-if="header.text" class="es-header-text">{{
                 header.text
               }}</span>
-              <i
+              <es-icon
                 v-if="header.icons"
                 class="es-header-icons"
-                :class="header.icons"
-              ></i>
+                :contents="header.icons"
+              ></es-icon>
               <el-menu
                 v-if="header.tabs"
                 slot="suffix"

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

@@ -11,6 +11,7 @@
   >
     <es-toolbar
       v-if="showToolbar"
+      ref="toolbar"
       v-bind="{
         contents: toolbars,
         showLabel: showLabel,
@@ -150,6 +151,7 @@
 </template>
 <script>
 import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import children from './children.vue';
 import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
@@ -624,7 +626,7 @@ export default {
     param: {
       deep: true,
       handler(val) {
-        this.getTableData();
+        this.getTableData(112);
       }
     },
     page: {
@@ -673,6 +675,9 @@ export default {
     }
   },
   created() {
+    this.getTableData = debounce(300, (res) => {
+      this.getTableDatas(res);
+    });
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
     }
@@ -907,7 +912,7 @@ export default {
           }
         });
     },
-    getTableData(res) {
+    getTableDatas(res) {
       let where;
       let first;
       if (res) {
@@ -1028,6 +1033,7 @@ export default {
     },
     doLayout() {
       this.$refs.oaTable.doLayout();
+      this.$refs.oaTable.updateScroll();
     },
     sort(prop, order) {
       this.$refs.oaTable.sort(prop, order);
@@ -1496,6 +1502,9 @@ export default {
       this.sysCodes.forEach((item) => {
         bus.$off(item, this.setOptions);
       });
+    },
+    reset() {
+      this.$refs.toolbar && this.$refs.toolbar.reset();
     }
   }
 };

package/packages/icon/src/main.vue

@@ -1,6 +1,9 @@
 <template>
-  <i :class="className">
-    <slot>{{ code }}</slot>
+  <i
+    :class="[className, { 'es-pointer': Object.keys(event).length }]"
+    v-on="event"
+    v-html="code"
+  >
   </i>
 </template>
 <script>
@@ -20,12 +23,14 @@ export default {
           if (typeof val == 'string') {
             if (util.startWith(val, '&#')) {
               this.code = val;
+              this.className = 'es-icon';
             } else {
               this.className = val;
             }
           } else {
             this.code = val.code;
-            this.className = val.className;
+            this.className = val.class || val.className;
+            this.event = val.events;
           }
         }
       }
@@ -34,7 +39,8 @@ export default {
   data() {
     return {
       code: '',
-      className: ''
+      className: '',
+      event: {}
     };
   },
   created() {},

package/packages/login/src/main.vue

@@ -377,6 +377,12 @@ export default {
       type: String,
       default: '账号登录'
     },
+    param: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
     loginBackground: [String, Array],
     loginImage: [String, Array],
     loginLogo: String,
@@ -1151,6 +1157,7 @@ export default {
       this.$refs['login'].validate((valid) => {
         if (valid) {
           this.submit = true;
+          let param = util.getParams() || {};
           const data =
             this.active == '0'
               ? {
@@ -1186,12 +1193,16 @@ export default {
                 };
           if (this.onLogin) {
             if (this.active == '0') {
-              this.onLogin(data, this.getImgCode, this.handleRemember);
+              this.onLogin(
+                { ...param, ...data },
+                this.getImgCode,
+                this.handleRemember
+              );
             } else {
-              this.onLogin(data);
+              this.onLogin({ ...param, ...data });
             }
           } else {
-            this.handleUserLogin(data);
+            this.handleUserLogin({ ...param, ...this.param, ...data });
           }
         } else {
           this.submit = false;

package/packages/main/src/main.vue

@@ -950,7 +950,10 @@ export default {
           this.color = unescape(results[i].themeColor).toLowerCase();
         }
         if (i === 'userStyle' && results[i].color) {
-          this.color = unescape(results[i].color).toLowerCase();
+          let color = unescape(results[i].color).toLowerCase();
+          if (util.startWith(color, '#')) {
+            this.color = color;
+          }
         }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
           try {

package/packages/selector/src/main.vue

@@ -210,7 +210,6 @@
 import util from 'eoss-ui/src/utils/util.js';
 import { getSelectorOrgDetail } from 'eoss-ui/src/config/api.js';
 import Clickoutside from 'eoss-element/src/utils/clickoutside';
-import { debounce } from 'eoss-element/src/utils/util';
 export default {
   name: 'EsSelector',
   inheritAttrs: false,