eoss-ui 0.4.77 → 0.4.79-beta.0

package/lib/tabs-panel.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 58);
+/******/ 	return __webpack_require__(__webpack_require__.s = 59);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 58:
+/***/ 59:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tabs.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 57);
+/******/ 	return __webpack_require__(__webpack_require__.s = 58);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3352,7 +3352,7 @@ module.exports = require("eoss-element");
 
 /***/ }),
 
-/***/ 57:
+/***/ 58:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tips.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 59);
+/******/ 	return __webpack_require__(__webpack_require__.s = 60);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3352,7 +3352,14 @@ module.exports = require("eoss-element");
 
 /***/ }),
 
-/***/ 59:
+/***/ 6:
+/***/ (function(module, exports) {
+
+module.exports = require("json-bigint");
+
+/***/ }),
+
+/***/ 60:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3577,13 +3584,6 @@ main.install = function (Vue) {
 
 /***/ }),
 
-/***/ 6:
-/***/ (function(module, exports) {
-
-module.exports = require("json-bigint");
-
-/***/ }),
-
 /***/ 7:
 /***/ (function(module, exports) {
 

package/lib/toolbar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 75);
+/******/ 	return __webpack_require__(__webpack_require__.s = 76);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 75:
+/***/ 76:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 61);
+/******/ 	return __webpack_require__(__webpack_require__.s = 62);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3359,7 +3359,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 61:
+/***/ 62:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 60);
+/******/ 	return __webpack_require__(__webpack_require__.s = 61);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3359,7 +3359,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 60:
+/***/ 61:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 63);
+/******/ 	return __webpack_require__(__webpack_require__.s = 64);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3359,7 +3359,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 63:
+/***/ 64:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 64);
+/******/ 	return __webpack_require__(__webpack_require__.s = 65);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3359,7 +3359,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 64:
+/***/ 65:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.77",
+  "version": "0.4.79-beta.0",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -54,6 +54,7 @@
   "style": "lib/theme-chalk/index.css",
   "dependencies": {
     "axios": "^0.27.2",
+    "interactjs": "^1.10.26",
     "json-bigint": "^1.0.0",
     "net": "^1.0.2",
     "qrcode": "^1.5.1",

package/packages/button/src/main.vue

@@ -26,6 +26,7 @@ export default {
     hide: Boolean,
     param: Object,
     type: String,
+    mold: String,
     size: String,
     open: Boolean,
     reload: Boolean,
@@ -43,197 +44,216 @@ export default {
     closed: Function,
     stop: Boolean,
     syncKeys: Object,
-    text: String
+    text: String,
+    onClick: Function
+  },
+  computed: {
+    _type() {
+      return [
+        'default',
+        'primary',
+        'success',
+        'info',
+        'warning',
+        'danger'
+      ].includes(this.type)
+        ? this.type
+        : this.mold;
+    }
   },
   data() {
     return {};
   },
   methods: {
     handleClick(evt) {
-      if (this.open && this.link) {
-        let windows;
-        let fields = [];
-        let param = this.param ? this.param : {};
-        evt.stopPropagation();
-        evt.preventDefault();
-        let width = util.win.top.screen.availWidth - 10;
-        let height = util.win.top.screen.availHeight - 60;
-        let flag = true;
-        if (this.esForm) {
-          let params = util.getParams({ url: this.link });
-          let modal = this.esForm.models;
-          let models = util.extend({}, params || {}, modal);
-          if (this.required) {
-            if (Array.isArray(this.required)) {
-              this.esForm.validateField(this.required, (res) => {
-                if (res) {
-                  flag = false;
-                } else {
-                  flag = true;
-                }
-              });
-              if (flag) {
-                fields = this.required;
-                this.required.forEach((item) => {
-                  param[item] = models[item];
+      if (this.onClick) {
+        this.onClick(evt);
+      } else {
+        if (this.open && this.link) {
+          let windows;
+          let fields = [];
+          let param = this.param ? this.param : {};
+          evt.stopPropagation();
+          evt.preventDefault();
+          let width = util.win.top.screen.availWidth - 10;
+          let height = util.win.top.screen.availHeight - 60;
+          let flag = true;
+          if (this.esForm) {
+            let params = util.getParams({ url: this.link });
+            let modal = this.esForm.models;
+            let models = util.extend({}, params || {}, modal);
+            if (this.required) {
+              if (Array.isArray(this.required)) {
+                this.esForm.validateField(this.required, (res) => {
+                  if (res) {
+                    flag = false;
+                  } else {
+                    flag = true;
+                  }
                 });
-              }
-            } else if (typeof this.required === 'object') {
-              for (let i in this.required) {
-                fields.push(this.required[i]);
-                param[i] = models[this.required[i]];
-              }
-              this.esForm.validateField(fields, (res) => {
-                if (res) {
-                  flag = false;
-                } else {
-                  flag = true;
+                if (flag) {
+                  fields = this.required;
+                  this.required.forEach((item) => {
+                    param[item] = models[item];
+                  });
                 }
-              });
-            } else {
-              this.esForm.validateField(this.required, (res) => {
-                if (res) {
-                  flag = false;
-                } else {
-                  flag = true;
+              } else if (typeof this.required === 'object') {
+                for (let i in this.required) {
+                  fields.push(this.required[i]);
+                  param[i] = models[this.required[i]];
                 }
-              });
-              if (flag) {
-                fields = this.required;
-                if (
-                  models[this.required] == null ||
-                  models[this.required] == undefined ||
-                  models[this.required] == ''
-                ) {
-                  param[this.required] = models[this.required];
+                this.esForm.validateField(fields, (res) => {
+                  if (res) {
+                    flag = false;
+                  } else {
+                    flag = true;
+                  }
+                });
+              } else {
+                this.esForm.validateField(this.required, (res) => {
+                  if (res) {
+                    flag = false;
+                  } else {
+                    flag = true;
+                  }
+                });
+                if (flag) {
+                  fields = this.required;
+                  if (
+                    models[this.required] == null ||
+                    models[this.required] == undefined ||
+                    models[this.required] == ''
+                  ) {
+                    param[this.required] = models[this.required];
+                  }
                 }
               }
             }
-          }
-          if (this.fields) {
-            let empty = [];
-            if (Array.isArray(this.fields)) {
-              this.fields.forEach((item) => {
-                if (models[item] == undefined || models[item] == '') {
-                  empty.push(item);
+            if (this.fields) {
+              let empty = [];
+              if (Array.isArray(this.fields)) {
+                this.fields.forEach((item) => {
+                  if (models[item] == undefined || models[item] == '') {
+                    empty.push(item);
+                  }
+                  param[item] = models[item];
+                });
+              } else if (typeof this.fields === 'object') {
+                for (let i in this.fields) {
+                  if (
+                    models[this.fields[i]] == undefined ||
+                    models[this.fields[i]] == ''
+                  ) {
+                    empty.push(this.fields[i]);
+                  }
+                  param[i] = models[this.fields[i]];
                 }
-                param[item] = models[item];
-              });
-            } else if (typeof this.fields === 'object') {
-              for (let i in this.fields) {
+              } else {
                 if (
-                  models[this.fields[i]] == undefined ||
-                  models[this.fields[i]] == ''
+                  models[this.fields] == undefined ||
+                  models[this.fields] == ''
                 ) {
-                  empty.push(this.fields[i]);
+                  empty.push(this.fields);
                 }
-                param[i] = models[this.fields[i]];
-              }
-            } else {
-              if (
-                models[this.fields] == undefined ||
-                models[this.fields] == ''
-              ) {
-                empty.push(this.fields);
-              }
-              param[this.fields] = models[this.fields];
-            }
-            if (empty.length) {
-              let msg = [];
-              if (this.mapFields) {
-                empty.forEach((item) => {
-                  msg.push(this.mapFields[item]);
-                });
-              } else {
-                msg = empty;
+                param[this.fields] = models[this.fields];
               }
-              if (this.message) {
-                flag = false;
-                if (typeof this.message == 'boolean') {
-                  this.$message.error(msg.join(',') + '不能为空！');
-                } else {
-                  let message =
-                    msg.join(',') + (this.message.message || '不能为空！');
-                  this.$message({
-                    type: 'error',
-                    ...this.message,
-                    message: message
+              if (empty.length) {
+                let msg = [];
+                if (this.mapFields) {
+                  empty.forEach((item) => {
+                    msg.push(this.mapFields[item]);
                   });
-                }
-              }
-              if (this.alert) {
-                flag = false;
-                if (typeof this.alert == 'boolean') {
-                  this.$alert(msg.join(',') + '不能为空！', '提示', {
-                    type: 'error',
-                    confirmButtonText: '确定'
-                  }).catch();
                 } else {
-                  let message =
-                    msg.join(',') + (this.alert.message || '不能为空！');
-                  this.$alert(
-                    message,
-                    this.alert.titl || '提示',
-                    this.alert.config || {
+                  msg = empty;
+                }
+                if (this.message) {
+                  flag = false;
+                  if (typeof this.message == 'boolean') {
+                    this.$message.error(msg.join(',') + '不能为空！');
+                  } else {
+                    let message =
+                      msg.join(',') + (this.message.message || '不能为空！');
+                    this.$message({
+                      type: 'error',
+                      ...this.message,
+                      message: message
+                    });
+                  }
+                }
+                if (this.alert) {
+                  flag = false;
+                  if (typeof this.alert == 'boolean') {
+                    this.$alert(msg.join(',') + '不能为空！', '提示', {
                       type: 'error',
                       confirmButtonText: '确定'
-                    }
-                  ).catch();
+                    }).catch();
+                  } else {
+                    let message =
+                      msg.join(',') + (this.alert.message || '不能为空！');
+                    this.$alert(
+                      message,
+                      this.alert.titl || '提示',
+                      this.alert.config || {
+                        type: 'error',
+                        confirmButtonText: '确定'
+                      }
+                    ).catch();
+                  }
                 }
               }
             }
           }
-        }
-        if (this.btnGroup && this.syncKeys) {
-          let data = this.btnGroup.data;
-          if (
-            data &&
-            Object.keys(data).length &&
-            Object.keys(this.syncKeys).length
-          ) {
-            for (let i in this.syncKeys) {
-              param[i] = data[this.syncKeys[i]];
+          if (this.btnGroup && this.syncKeys) {
+            let data = this.btnGroup.data;
+            if (
+              data &&
+              Object.keys(data).length &&
+              Object.keys(this.syncKeys).length
+            ) {
+              for (let i in this.syncKeys) {
+                param[i] = data[this.syncKeys[i]];
+              }
             }
           }
-        }
-        if (flag) {
-          if (this.specs) {
-            if (typeof this.specs === 'boolean') {
-              windows = util.win.top.open(
-                util.urlJoinParams({ url: this.link, param: param }),
-                this.name,
-                `width=${width}px,height=${height}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
-              );
+          if (flag) {
+            if (this.specs) {
+              if (typeof this.specs === 'boolean') {
+                windows = util.win.top.open(
+                  util.urlJoinParams({ url: this.link, param: param }),
+                  this.name,
+                  `width=${width}px,height=${height}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
+                );
+              } else {
+                windows = util.win.top.open(
+                  util.urlJoinParams({ url: this.link, param: param }),
+                  this.name,
+                  this.specs
+                );
+              }
             } else {
               windows = util.win.top.open(
-                util.urlJoinParams({ url: this.link, param: param }),
-                this.name,
-                this.specs
+                util.urlJoinParams({ url: this.link, param: param })
               );
             }
-          } else {
-            windows = util.win.top.open(
-              util.urlJoinParams({ url: this.link, param: param })
-            );
           }
-        }
-        if (windows) {
-          let times = setInterval(() => {
-            if (windows.closed) {
-              clearInterval(times);
-              this.closed && this.closed(param);
-              if (this.reload) {
-                this.esSelect && this.esSelect.reload(null, param, true);
-                this.esTable && this.esTable.reload(param);
+          if (windows) {
+            let times = setInterval(() => {
+              if (windows.closed) {
+                clearInterval(times);
+                this.closed && this.closed(param);
+                if (this.reload) {
+                  this.esSelect && this.esSelect.reload(null, param, true);
+                  this.esTable && this.esTable.reload(param);
+                }
               }
-            }
-          }, 1000);
+            }, 1000);
+          }
+        } else if (this.stop) {
+          evt.stopPropagation();
+          evt.preventDefault();
         }
-      } else if (this.stop) {
-        evt.stopPropagation();
-        evt.preventDefault();
+        this.$emit('click', evt);
       }
-      this.$emit('click', evt);
     }
   },
   render(h) {
@@ -245,7 +265,7 @@ export default {
     }
     let tag = 'el-button';
     let clas = ['es-button'];
-    let props = { type: this.type, size: this.size };
+    let props = { type: this._type, size: this.size };
     let attrs = {};
     if (this.link && !this.open) {
       const link = this.param
@@ -255,7 +275,7 @@ export default {
       tag = 'a';
       clas = clas.concat([
         'el-button',
-        this.type ? `el-button--${this.type}` : 'el-button--default',
+        this._type ? `el-button--${this._type}` : 'el-button--default',
         this.size ? `el-button--${this.size}` : ''
       ]);
     }
@@ -275,14 +295,12 @@ export default {
       },
       this.iconPlacement === 'start'
         ? [
-            this.text,
-            this.$slots.default,
-            this.icon ? h('i', { class: this.icon }) : ''
+            this.icon ? h('i', { class: this.icon }) : '',
+            this.$slots.default || this.text
           ]
         : [
-            this.icon ? h('i', { class: this.icon }) : '',
-            this.text,
-            this.$slots.default
+            this.$slots.default || this.text,
+            this.icon ? h('i', { class: this.icon }) : ''
           ]
     );
   }

package/packages/form/src/main.vue

@@ -609,9 +609,10 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['disabled']
+                                  attrs: ['disabled', 'type']
                                 })
                               "
+                              @click="handleClick(inline)"
                             ></es-button>
                             <div
                               class="es-form-inline es-form-item-inline"
@@ -1520,9 +1521,10 @@
                           v-bind="
                             handleExclAttribute({
                               data: inline,
-                              attrs: ['disabled']
+                              attrs: ['disabled', 'type']
                             })
                           "
+                          @click="handleClick(inline)"
                         ></es-button>
                         <div
                           class="es-form-inline es-form-item-inline"
@@ -2480,9 +2482,10 @@
                             v-bind="
                               handleExclAttribute({
                                 data: inline,
-                                attrs: ['disabled']
+                                attrs: ['disabled', 'type']
                               })
                             "
+                            @click="handleClick(inline)"
                           ></es-button>
                           <div
                             class="es-form-inline es-form-item-inline"
@@ -3352,9 +3355,10 @@
                         v-bind="
                           handleExclAttribute({
                             data: inline,
-                            attrs: ['disabled']
+                            attrs: ['disabled', 'type']
                           })
                         "
+                        @click="handleClick(inline)"
                       ></es-button>
                       <div
                         class="es-form-inline es-form-item-inline"
@@ -4530,13 +4534,13 @@ export default {
         if (res.validate) {
           this.$refs.esForm.validate(async (valid, fields, triggers) => {
             if (valid) {
-              res.event(res, this.models);
+              res.event(res, this.models, index);
             } else {
               this.setScroll(valid, triggers, this.$refs.scrollbar);
             }
           });
         } else {
-          res.event(res, this.models);
+          res.event(res, this.models, index);
         }
       } else if (res.type === 'step') {
         if (this.stepActive < index) {