eoss-ui 0.7.19 → 0.7.20

package/lib/tree.js

@@ -4165,7 +4165,7 @@ module.exports = require("axios");
 // 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/tree/src/main.vue?vue&type=template&id=cd716718&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=39950d7e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4367,7 +4367,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=cd716718&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=39950d7e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4778,7 +4778,7 @@ var util = __webpack_require__(0);
     getTreeDatas: function getTreeDatas(param) {
       var _this2 = this;
 
-      var params = util["a" /* default */].extend({}, this.param, this.where, param || {});
+      var params = util["a" /* default */].extend({}, this.param, param || {}, this.where);
       if (!this.url || !this.isRemote) return;
       this.loading = true;
       util["a" /* default */].ajax({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.19",
+  "version": "0.7.20",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -5,6 +5,7 @@
         <template v-if="item && !item.hide">
           <es-upload
             v-if="item.upload || (item.code && item.ownId)"
+            :key="index"
             v-bind="{
               ...exclAttribute({
                 data: item,
@@ -18,6 +19,35 @@
             }"
             v-on="item.events"
           ></es-upload>
+          <el-tooltip
+            :key="index"
+            v-else-if="item.showTooltip"
+            :effect="item.effect ? item.effect : 'dark'"
+            :content="item.tips"
+            :placement="item.placement ? item.placement : 'top'"
+          >
+            <es-button
+              :stop="stop"
+              :data="data"
+              :outside="outside"
+              v-bind="
+                exclAttribute({
+                  data: item,
+                  attrs: ['events']
+                })
+              "
+              :size="size"
+              :type="mode == 'plus' ? 'text' : item.type"
+              v-on="item.events"
+              @click="handleClick({ ...data, handle: item })"
+            >
+              {{
+                item.template
+                  ? item.template({ ...data, config: item })
+                  : item.text
+              }}
+            </es-button>
+          </el-tooltip>
           <es-button
             v-else
             :stop="stop"
@@ -110,6 +140,21 @@
                 : item.text
             }}
           </es-selector>
+          <el-tooltip
+            :key="index"
+            v-else-if="item.showTooltip"
+            :effect="item.effect ? item.effect : 'dark'"
+            :content="item.tips"
+            :placement="item.placement ? item.placement : 'top'"
+          >
+            <span type="text">
+              {{
+                item.template
+                  ? item.template({ ...data, config: item })
+                  : item.text
+              }}
+            </span></el-tooltip
+          >
           <template v-else>
             <i :class="item.icon" v-if="item.icon"></i
             >{{
@@ -247,10 +292,13 @@ export default {
         return item.hide !== true;
       });
       let newBtns = arry.map((item) => {
-        let badge;
+        let badge, tips;
         if (item.badge && typeof item.badge === 'function') {
           badge = item.badge(this.data.row);
         }
+        if (item.tips && typeof item.tips === 'function') {
+          item.tips = item.tips(this.data.row);
+        }
         return badge ? { ...item, badge: badge } : { ...item };
       });
       if (this.sort) {

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

@@ -184,6 +184,7 @@ export default {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
         noticeType: [],
+        noticeList:[],
         noticeInfo: '',
         opinion: ''
       },

package/packages/tree/src/main.vue

@@ -408,7 +408,7 @@ export default {
     },
     //获取树节点
     getTreeDatas(param) {
-      let params = util.extend({}, this.param, this.where, param || {});
+      let params = util.extend({}, this.param, param || {}, this.where);
       if (!this.url || !this.isRemote) return;
       this.loading = true;
       util

package/src/index.js

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