eoss-ui 0.4.44 → 0.4.46

package/lib/main.js

@@ -2772,7 +2772,7 @@ module.exports = require("stompjs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=7e69a69c&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6b3fed86&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2971,6 +2971,9 @@ var render = function () {
                             "is-default": _vm.isDefault,
                           },
                           on: {
+                            open: function (res) {
+                              _vm.handleSelect(res, "menu")
+                            },
                             trigger: function (res) {
                               _vm.handleSelect(res, "sub")
                             },
@@ -3191,7 +3194,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=7e69a69c&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6b3fed86&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=1965153d&
 var userinfovue_type_template_id_1965153d_render = function () {
@@ -4981,6 +4984,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -6018,12 +6026,25 @@ var log = util["a" /* default */].getParams('console');
             }
           }
           if (node.url) {
-            var _tab = (node.fourthTabs || []).filter(function (item) {
-              return item.url === node.url;
-            })[0];
-            if (_tab) {
-              this.tabs = node.fourthTabs;
-              this.tabsId = _tab.id;
+            if (node.children && node.children.length) {
+              var _tab = node.children.filter(function (item) {
+                return item.url === node.url;
+              })[0];
+              if (_tab) {
+                if (this.biserial) {
+                  this.$set(this.active, 1, _tab.id);
+                } else {
+                  this.active = _tab.id;
+                }
+              }
+            } else {
+              var _tab2 = (node.fourthTabs || []).filter(function (item) {
+                return item.url === node.url;
+              })[0];
+              if (_tab2) {
+                this.tabs = node.fourthTabs;
+                this.tabsId = _tab2.id;
+              }
             }
           } else if (node.fourthTabs.length) {
             this.tabs = node.fourthTabs;

package/lib/menu.js

@@ -332,13 +332,25 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         mode: this.mode
       });
     },
-    handleOpen: function handleOpen(key, keyPath) {
+    handleOpen: function handleOpen(key, keyPath, item) {
       this.menuId = key;
-      this.$emit('open', { key: key, path: keyPath });
+      this.$emit('open', {
+        key: key,
+        path: keyPath,
+        node: item.$attrs.data,
+        item: item,
+        mode: this.mode
+      });
     },
-    handleClose: function handleClose(key, keyPath) {
+    handleClose: function handleClose(key, keyPath, item) {
       this.menuId = null;
-      this.$emit('close', { key: key, path: keyPath });
+      this.$emit('close', {
+        key: key,
+        path: keyPath,
+        node: item.$attrs.data,
+        item: item,
+        mode: this.mode
+      });
     },
     getSub: function getSub(item, h, popper) {
       var _this3 = this;
@@ -384,7 +396,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             maxHeight: this.maxHeight,
             paddingLeft: this.paddingLeft
           },
-          attrs: { index: item.id, key: item.id }
+          attrs: { data: item, index: item.id, key: item.id }
         }, doms)];
       } else if (this.deep && this.mode === 'horizontal' && item.fourthTabs && item.fourthTabs.length && (!item.extendData || item.extendData.businessStatus != 0)) {
         doms = doms.concat(item.fourthTabs.map(function (ele, index) {
@@ -402,7 +414,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             maxHeight: this.maxHeight,
             paddingLeft: this.paddingLeft
           },
-          attrs: { index: item.id, key: item.id }
+          attrs: { data: item, index: item.id, key: item.id }
         }, doms)];
       } else {
         return [h('el-menu-item', {

package/lib/nav.js

@@ -2698,7 +2698,7 @@ module.exports = require("eoss-element");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=a32b0cca&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=84cce570&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2841,7 +2841,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=a32b0cca&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=84cce570&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3067,11 +3067,11 @@ var util = __webpack_require__(0);
     handleSelect: function handleSelect(res) {
       this.$emit('select', res);
     },
-    handleOpen: function handleOpen(key, keyPath) {
-      this.$emit('open', { key: key, path: keyPath });
+    handleOpen: function handleOpen(res) {
+      this.$emit('open', res);
     },
-    handleClose: function handleClose(key, keyPath) {
-      this.$emit('close', { key: key, path: keyPath });
+    handleClose: function handleClose(res) {
+      this.$emit('close', res);
     },
     resetHeight: function resetHeight() {
       var _this3 = this;

package/package.json

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

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

@@ -1129,7 +1129,7 @@ export default {
     },
     hanleReset() {
       if (this.url) {
-        this.where = {};
+        this.wheres = {};
         this.getTableData();
       }
       this.$emit('reset');

package/packages/flow/src/main.vue

@@ -3,6 +3,7 @@
     class="es-flow-index"
     :class="{ 'es-flow-narrow': shrink }"
     :style="shrink ? 'width:48px' : ''"
+    v-if="!shrinkAbled"
   >
     <div class="es-flow-top">
       <div class="es-flow-title">
@@ -221,7 +222,9 @@
                   :radioList="radioList"
                   :multiple="multiple"
                   :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
-                  :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
+                  :isCurrentNodeForbiddenChangeCandidate="
+                    isCurrentNodeForbiddenChangeCandidate
+                  "
                   :options="options"
                   :mix="multiple"
                   :presetEdit="presetEdit"
@@ -379,7 +382,11 @@
       </div>
       <div
         class="es-user-defined"
-        v-if="nodeInfos.length > 0 || nodeInfo.option.length > 0 || operationList.length>0"
+        v-if="
+          nodeInfos.length > 0 ||
+          nodeInfo.option.length > 0 ||
+          operationList.length > 0
+        "
       >
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
@@ -633,6 +640,7 @@ export default {
       flowMultiple: true,
       isCustomUser: 0,
       shrink: false,
+      shrinkAbled:false,
       taskExamineInfo: {},
       presetUserJson: [],
       presetList: [],
@@ -683,7 +691,7 @@ export default {
       showTaskUnionExamine: false, //展示联合审核弹窗
       charUrl: util.win.location.origin,
       endFlow: false, // 是否结束流程
-      isCurrentNodeForbiddenChangeCandidate:0,//是否禁止选择办理人
+      isCurrentNodeForbiddenChangeCandidate: 0, //是否禁止选择办理人
       isSubmitButtonShowAgreeAndDisagree: 0, //是否展示同意和不同意按钮
       pointsReadingObj: {
         value: '分阅',
@@ -904,7 +912,6 @@ export default {
       }
     },
     setShrink() {
-      this.shrink = !this.shrink;
       this.$emit('shrink', this.shrink);
     },
     customLoading(type) {
@@ -1649,11 +1656,11 @@ export default {
         .ajax({ url: getHandleInfoHtml, params })
         .then((res) => {
           //pc返回数据
-          const {
-            status,
-            message,
+          
+          this.loading.close();
+          if (res.status === 'success') {
+            const {
             data: {
-              isEndUserTask,
               nextNodeList,
               taskOperations,
               isCustomPreset,
@@ -1678,8 +1685,6 @@ export default {
               taskButtonList
             }
           } = res;
-          this.loading.close();
-          if (status === 'success') {
             this.$emit('startTaskRead', res);
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
@@ -1742,7 +1747,8 @@ export default {
                   this.nodeFixedOpinionSelectList.push({ content: x });
                 });
               }
-              this.isCurrentNodeForbiddenChangeCandidate =  nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
+              this.isCurrentNodeForbiddenChangeCandidate =
+                nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
               this.nodeDefaultSubmitOpinion =
                 nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
               this.isSubmitButtonShowAgreeAndDisagree =
@@ -1773,7 +1779,9 @@ export default {
             this.choiceOrgId = choiceOrgId;
             this.choiceDeptId = choiceDeptId;
             this.pOrgId = pOrgId;
-            this.isEndUserTask = isEndUserTask;
+            if (res.data && res.data.isEndUserTask != undefined) {
+              this.isEndUserTask = res.data.isEndUserTask;
+            }
             if (JSON.stringify(taskExamine) != '{}' && taskExamine) {
               this.nodeInfo.nextNode = taskExamine.processDefinitionId;
               this.NodeName = taskExamine.nodeName;
@@ -1844,7 +1852,12 @@ export default {
             this.getNodeType();
             this.getNodeInfo();
           } else {
-            this.$message.error(message || '系统错误，请联系管理员！');
+            if(res.status === "taskCompleted"){
+              this.shrinkAbled = true
+              this.$message.warning(res.message || '系统错误，请联系管理员！');
+            }else{
+              this.$message.error(res.message || '系统错误，请联系管理员！');
+            }
           }
         })
         .catch((err) => {

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

@@ -8,26 +8,18 @@
         align="center"
         label="经办部门"
         width="150"
+        show-overflow-tooltip
       >
       </el-table-column>
       <el-table-column
         align="center"
         label="步骤"
         width="110"
+        prop="itemname"
         show-overflow-tooltip
       >
-        <template slot-scope="scope"
-          ><span :title="scope.row.itemname">{{
-            scope.row.itemid
-          }}</span></template
-        >
       </el-table-column>
-      <el-table-column align="center" label="办理人" width="110">
-        <template slot-scope="scope"
-          ><span :title="scope.row.userName">{{
-            scope.row.userid
-          }}</span></template
-        >
+      <el-table-column align="center" show-overflow-tooltip prop="userName" label="办理人" width="110">
       </el-table-column>
       <el-table-column
         label="状态"

package/packages/main/src/main.vue

@@ -119,6 +119,11 @@
           :showCollapse="showNavTitle"
           :menu-tips="menuTips"
           :is-default="isDefault"
+          @open="
+            (res) => {
+              handleSelect(res, 'menu');
+            }
+          "
           @trigger="
             (res) => {
               handleSelect(res, 'sub');
@@ -1340,12 +1345,25 @@ export default {
             }
           }
           if (node.url) {
-            let tab = (node.fourthTabs || []).filter((item) => {
-              return item.url === node.url;
-            })[0];
-            if (tab) {
-              this.tabs = node.fourthTabs;
-              this.tabsId = tab.id;
+            if (node.children && node.children.length) {
+              let tab = node.children.filter((item) => {
+                return item.url === node.url;
+              })[0];
+              if (tab) {
+                if (this.biserial) {
+                  this.$set(this.active, 1, tab.id);
+                } else {
+                  this.active = tab.id;
+                }
+              }
+            } else {
+              let tab = (node.fourthTabs || []).filter((item) => {
+                return item.url === node.url;
+              })[0];
+              if (tab) {
+                this.tabs = node.fourthTabs;
+                this.tabsId = tab.id;
+              }
             }
           } else if (node.fourthTabs.length) {
             this.tabs = node.fourthTabs;

package/packages/menu/src/main.vue

@@ -128,13 +128,25 @@ export default {
         mode: this.mode
       });
     },
-    handleOpen(key, keyPath) {
+    handleOpen(key, keyPath, item) {
       this.menuId = key;
-      this.$emit('open', { key: key, path: keyPath });
+      this.$emit('open', {
+        key: key,
+        path: keyPath,
+        node: item.$attrs.data,
+        item: item,
+        mode: this.mode
+      });
     },
-    handleClose(key, keyPath) {
+    handleClose(key, keyPath, item) {
       this.menuId = null;
-      this.$emit('close', { key: key, path: keyPath });
+      this.$emit('close', {
+        key: key,
+        path: keyPath,
+        node: item.$attrs.data,
+        item: item,
+        mode: this.mode
+      });
     },
     getSub(item, h, popper) {
       if (popper) {
@@ -226,7 +238,7 @@ export default {
                 maxHeight: this.maxHeight,
                 paddingLeft: this.paddingLeft
               },
-              attrs: { index: item.id, key: item.id }
+              attrs: { data: item, index: item.id, key: item.id }
             },
             doms
           )
@@ -258,7 +270,7 @@ export default {
                 maxHeight: this.maxHeight,
                 paddingLeft: this.paddingLeft
               },
-              attrs: { index: item.id, key: item.id }
+              attrs: { data: item, index: item.id, key: item.id }
             },
             doms
           )

package/packages/nav/src/main.vue

@@ -144,7 +144,7 @@ export default {
             } else {
               this.active = val[val.length - 1];
             }
-            this.menu.forEach(item => {
+            this.menu.forEach((item) => {
               if (item.id === this.active) {
                 this.subMenu = item.children;
                 this.headline = this.title ? this.title : item.text;
@@ -168,7 +168,7 @@ export default {
           } else {
             this.active = this.defaultActive[this.defaultActive.length - 1];
           }
-          val.forEach(item => {
+          val.forEach((item) => {
             if (item.id === this.active) {
               this.subMenu = item.children;
               this.headline = this.title ? this.title : item.text;
@@ -223,16 +223,16 @@ export default {
     handleSelect(res) {
       this.$emit('select', res);
     },
-    handleOpen(key, keyPath) {
-      this.$emit('open', { key: key, path: keyPath });
+    handleOpen(res) {
+      this.$emit('open', res);
     },
-    handleClose(key, keyPath) {
-      this.$emit('close', { key: key, path: keyPath });
+    handleClose(res) {
+      this.$emit('close', res);
     },
     resetHeight() {
       this.$nextTick(() => {
         let height = this.$refs.esNav.parentNode.offsetHeight;
-        Array.from(this.$refs.esNav.parentNode.children).forEach(item => {
+        Array.from(this.$refs.esNav.parentNode.children).forEach((item) => {
           if (item !== this.$refs.esNav) {
             let mt = util.getStyle(item, 'margin-top');
             let mb = util.getStyle(item, 'margin-bottom');

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.44',
+  version: '0.4.46',
   install,
   Button,
   ButtonGroup,