eoss-ui 0.4.61 → 0.4.63

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 67);
+/******/ 	return __webpack_require__(__webpack_require__.s = 66);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           var remind = sessionStorage.getItem('remind');
-          !remind && (loginMsg = setTimeout(function () {
-            sessionStorage.setItem('remind', 1);
-            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-              confirmButtonText: '确定',
-              closeOnClickModal: false,
-              type: 'warning'
-            } : {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              closeOnClickModal: false,
-              type: 'warning'
-            }).then(function () {
-              var loginPage = getStorage('login') || getStorage('loginPage');
-              if (loginPage) {
-                var src = void 0;
-                if (!startWith(loginPage, ['http', '/'])) {
-                  var pathname = win.top.location.pathname;
-                  if (pathname !== '/') {
-                    pathname = pathname.split('/');
-                    pathname.splice(pathname.length - 1);
-                    pathname = pathname.join('/');
-                    src = pathname + '/' + loginPage.replace('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            loginMsg = setTimeout(function () {
+              sessionStorage.setItem('remind', 1);
+              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+                confirmButtonText: '确定',
+                closeOnClickModal: false,
+                type: 'warning'
+              } : {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning'
+              }).then(function () {
+                var loginPage = getStorage('login') || getStorage('loginPage');
+                if (loginPage) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    var pathname = win.top.location.pathname;
+                    if (pathname !== '/') {
+                      pathname = pathname.split('/');
+                      pathname.splice(pathname.length - 1);
+                      pathname = pathname.join('/');
+                      src = pathname + '/' + loginPage.replace('./', '');
+                    } else {
+                      src = pathname + loginPage.replace('./', '');
+                    }
                   } else {
-                    src = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } else {
-                  src = loginPage;
-                }
-                win.top.location.href = src;
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
-              } else {
-                var hash = win.top.location.hash;
-                if (hash) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2862,7 +2864,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 67:
+/***/ 66:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

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

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

@@ -169,33 +169,24 @@ export default {
       return this.options ? this.options : this.data;
     },
     labelVal() {
-      if (typeof this.model === 'string') {
+      let model =
+        typeof this.model === 'string' ? this.model.split(',') : this.model;
+      let label = model.map((item) => {
+        if (util.isObject(item)) {
+          return item[this.label];
+        }
         if (util.isObject(this.results[0])) {
-          return this.results.map((item) => {
-            if (item[this.valueKey] === this.model) {
-              return item[this.label] || this.model;
-            }
-          });
+          return this.results
+            .map((ele) => {
+              if (ele[this.valueKey] === item) {
+                return ele[this.label];
+              }
+            })
+            .join(' ');
         }
-        return this.model;
-      } else {
-        let label = this.model.map((item) => {
-          if (util.isObject(item)) {
-            return item[this.label];
-          }
-          if (util.isObject(this.results[0])) {
-            return this.results
-              .map((ele) => {
-                if (ele[this.valueKey] === item) {
-                  return ele[this.label];
-                }
-              })
-              .join(' ');
-          }
-          return item;
-        });
-        return label.join(' ');
-      }
+        return item;
+      });
+      return label.join(' ');
     }
   },
   watch: {

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

@@ -64,7 +64,7 @@
           <el-form-item
             :name="name"
             :prop="item.field"
-            :rules="item.rules"
+            :rules="isNotRule(item, scope) ? [] : item.rules"
             :index="scope.$index"
             v-else
           >
@@ -587,6 +587,9 @@ export default {
     }
   },
   inject: {
+    elForm: {
+      default: ''
+    },
     tableReload: {
       default: ''
     }
@@ -798,6 +801,17 @@ export default {
         item.readonly
       );
     },
+    isNotRule(item, scope) {
+      if (
+        scope.row.canRule === false ||
+        (scope.row.notRules &&
+          scope.row.notRules.indexOf(item.field || item.prop) > -1)
+      ) {
+        this.elForm && this.elForm.clearValidate(item.field || item.prop);
+        return true;
+      }
+      return false;
+    },
     handleBlur(data) {
       let { item } = data;
       item.events && item.events.blur && item.events.blur(data);

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

@@ -27,7 +27,7 @@
         cancel: hanleCancel
       }"
     ></es-toolbar>
-    <p v-if="title" class="es-table-title" v-html="title"></p>
+    <p v-if="title" ref="title" class="es-table-title" v-html="title"></p>
     <div
       style="styles"
       class="es-data-table-content"
@@ -43,7 +43,10 @@
           showSummary: showTotal,
           sumText: sumText || totalText,
           totalRow: restotalRow || totalRow,
-          height: tableHeight !== 'auto' ? tableHeight : undefined,
+          height:
+            tableHeight !== 'auto' && tableHeight !== false
+              ? tableHeight
+              : undefined,
           border: border
         }"
         v-on="{
@@ -515,7 +518,11 @@ export default {
     scale: {
       deep: true,
       handler(val) {
-        if (this.tableHeight != 'auto' && this.display) {
+        if (
+          this.tableHeight != 'auto' &&
+          this.tableHeight !== false &&
+          this.display
+        ) {
           this.resetHeight();
           this.doLayout();
         }
@@ -523,7 +530,11 @@ export default {
     },
     zoom: {
       handler(val) {
-        if (this.tableHeight != 'auto' && this.display) {
+        if (
+          this.tableHeight != 'auto' &&
+          this.tableHeight !== false &&
+          this.display
+        ) {
           this.resetHeight();
           this.doLayout();
         }
@@ -797,12 +808,14 @@ export default {
               });
           } else {
             this.list = [];
+            this.tableHeight = false;
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);
           }
           this.$emit('success', res);
         })
         .catch((err) => {
+          this.tableHeight = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1194,51 +1207,49 @@ export default {
       }
     },
     resetHeight() {
-      this.$nextTick(() => {
-        if (this.full && !this.height && !this.maxHeight) {
-          let height =
-            this.$el.parentNode.offsetHeight -
-            parseInt(util.getStyle(this.$el.parentNode, 'paddingTop'), 10) -
-            parseInt(util.getStyle(this.$el.parentNode, 'paddingBottom'), 10);
-          for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
-            let ele = this.$el.parentNode.childNodes[i];
-            if (ele !== this.$el) {
-              height -= ele.offsetHeight === undefined ? 0 : ele.offsetHeight;
-            }
-          }
-          for (let i = 0; i < this.$el.childNodes.length; i++) {
-            let ele = this.$el.childNodes[i];
-            if (ele !== this.$refs.esTableContent) {
-              height -= ele.offsetHeight === undefined ? 0 : ele.offsetHeight;
-            }
-          }
-          this.styles = { height: height + 'px' };
-          const loadingDom =
-            this.$refs.esTableContent.querySelector('.el-loading-mask');
-          for (
-            let i = 0;
-            i < this.$refs.esTableContent.childNodes.length;
-            i++
-          ) {
-            let ele = this.$refs.esTableContent.childNodes[i];
-            if (
-              ele !== this.$refs.oaTable.$el &&
-              (!loadingDom || ele !== loadingDom)
-            ) {
-              height -= ele.offsetHeight === undefined ? 0 : ele.offsetHeight;
-            }
+      //this.$nextTick(() => {
+      if (this.full && !this.height && !this.maxHeight) {
+        let height =
+          this.$el.parentNode.offsetHeight -
+          parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -
+          parseInt(util.getStyle(this.$el.parentNode, 'padding-bottom'), 10);
+        for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
+          let ele = this.$el.parentNode.childNodes[i];
+          if (ele !== this.$el && ele.offsetHeight !== undefined) {
+            height =
+              height -
+              ele.offsetHeight -
+              parseInt(util.getStyle(ele, 'margin-top'), 10) -
+              parseInt(util.getStyle(ele, 'margin-bottom'), 10);
           }
-          let pt = parseInt(
-            util.getStyle(this.$refs.esTableContent, 'paddingTop'),
-            10
-          );
-          let pb = parseInt(
-            util.getStyle(this.$refs.esTableContent, 'paddingBottom'),
-            10
-          );
-          this.tableHeight = height - pt - pb + (this.page ? 2 : 1) + 'px';
         }
-      });
+        height -= this.showToolbar ? 45 : 0;
+        height -= this.page === false ? 0 : 46;
+        height -= this.title ? this.$refs.title.offsetHeight : 0;
+        height -= parseInt(
+          util.getStyle(this.$refs.esTableContent, 'padding-top'),
+          10
+        );
+        height -= parseInt(
+          util.getStyle(this.$refs.esTableContent, 'padding-bottom'),
+          10
+        );
+        let emptyText = this.$refs.esTableContent.querySelector(
+          '.el-table__empty-text'
+        );
+        let eht = 0;
+        if (emptyText) {
+          eht = emptyText.offsetHeight;
+          let thead =
+            this.$refs.esTableContent.querySelector('.el-table__header');
+          thead && (eht += thead.offsetHeight);
+        }
+        if (height > 1 && height - eht > 1) {
+          this.tableHeight = height;
+        } else {
+          console.warn(this.$el.parentNode, `获取不到高度！`);
+        }
+      }
     },
     validate(callback) {
       let form = this.elForm || this.$refs.esTableForm;

package/packages/flow/src/component/taskUnionExamine.vue

@@ -442,7 +442,6 @@ export default {
           newNextUser = `${item.stype}-${item.id}`;
         }
       });
-      //console.log(options, newNextUser, 'newNextUser');
       this.infoList[type] = newNextUser;
     },
     getNodeType() {

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

@@ -42,12 +42,24 @@
                     v-if="items.average"
                   >
                     <div class="es-tab-pane-main">
+                      <es-flow-list
+                        v-if="
+                          item.type === 'flow-list' || item.type === 'flowList'
+                        "
+                        :businessId="businessId"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['events', 'visible', 'type']
+                          })
+                        "
+                        :key="index"
+                        v-on="item.events"
+                      ></es-flow-list>
                       <es-data-table
                         v-if="
                           item.type === 'data-table' ||
-                          item.type === 'dataTable' ||
-                          item.type === 'flow-list' ||
-                          item.type === 'flowList'
+                          item.type === 'dataTable'
                         "
                         :appId="taskExamineAppId"
                         v-bind="
@@ -59,10 +71,7 @@
                         :class="{
                           'es-flow-group-data-table':
                             item.type === 'data-table' ||
-                            item.type === 'dataTable',
-                          'es-flow-list':
-                            item.type === 'flow-list' ||
-                            item.type === 'flowList'
+                            item.type === 'dataTable'
                         }"
                         :display="activeName === String(indexs)"
                         v-on="item.events"
@@ -151,12 +160,22 @@
                       :businessId.sync="businessId"
                       v-on="{ ...item.events }"
                     ></es-form>
+                    <es-flow-list
+                      v-if="
+                        item.type === 'flow-list' || item.type === 'flowList'
+                      "
+                      :businessId="businessId"
+                      v-bind="
+                        handleExclAttribute({
+                          data: item,
+                          attrs: ['events', 'visible', 'type']
+                        })
+                      "
+                      :key="index"
+                    ></es-flow-list>
                     <es-data-table
                       v-if="
-                        item.type === 'data-table' ||
-                        item.type === 'dataTable' ||
-                        item.type === 'flow-list' ||
-                        item.type === 'flowList'
+                        item.type === 'data-table' || item.type === 'dataTable'
                       "
                       :appId="taskExamineAppId"
                       v-bind="
@@ -169,9 +188,7 @@
                       :class="{
                         'es-flow-group-data-table':
                           item.type === 'data-table' ||
-                          item.type === 'dataTable',
-                        'es-flow-list':
-                          item.type === 'flow-list' || item.type === 'flowList'
+                          item.type === 'dataTable'
                       }"
                       :display="activeName === String(indexs)"
                       v-on="item.events"
@@ -379,6 +396,7 @@
       @save="handleSave"
       :closeParent="closeParent"
     ></es-flow>
+    <slot></slot>
   </div>
 </template>
 <script>

package/packages/flow-list/src/flow-table.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="height:100%">
-    <es-data-table :data="data" border style="width: 100%">
+    <es-data-table :toolbar="toolbar" :showFormBtn="false" :data="data" border style="width: 100%">
       <el-table-column type="index" align="center" label="序号" width="50">
       </el-table-column>
       <el-table-column
@@ -209,6 +209,10 @@ export default {
     hasAgent: {
       type: String,
       default: '1'
+    },
+    toolbar:{
+      type:Array,
+      default:() => []
     }
   },
   filters: {