eoss-ui 0.5.18 → 0.5.19

package/lib/main.js

@@ -3651,7 +3651,7 @@ module.exports = require("runtime-import");
 // 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=314bc538&
+// 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=450f1356&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4081,7 +4081,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=314bc538&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=450f1356&
 
 // 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=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -6340,9 +6340,19 @@ var log = util["a" /* default */].getParams('console');
 
     //隐藏操作按键
     hide: function hide() {
+      var mainConfig = JSON.parse(util["a" /* default */].getStorage('mainConfig'));
+      var topRightToolHide = '';
+      if (mainConfig && mainConfig.subsystemExtend && mainConfig.subsystemExtend.topRightToolHide) {
+        topRightToolHide = JSON.parse(mainConfig.subsystemExtend.topRightToolHide.replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2":'));
+      }
+      console.log(topRightToolHide);
+      console.log('Object.keys(topRightToolHide).length', Object.keys(topRightToolHide).length);
       if (this.layout === 'subsystem' || this.application) {
         if (this.hides && Object.keys(this.hides).length) {
           return _extends({}, this.hides, { set: !this.set, system: false });
+        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
+          console.log('topRightToolHide', topRightToolHide);
+          return _extends({}, topRightToolHide, { set: !this.set, system: false });
         } else {
           return { set: !this.set, system: false };
         }
@@ -6353,6 +6363,12 @@ var log = util["a" /* default */].getParams('console');
             system: true,
             user: true
           });
+        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
+          return _extends({}, topRightToolHide, {
+            set: !this.set,
+            system: true,
+            user: true
+          });
         } else {
           return { set: !this.set, system: true, user: true };
         }
@@ -6363,6 +6379,12 @@ var log = util["a" /* default */].getParams('console');
             system: true,
             user: true
           });
+        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
+          return _extends({}, topRightToolHide, {
+            set: !this.set,
+            system: true,
+            user: true
+          });
         } else {
           return { set: !this.set, system: true };
         }

package/lib/tree-group.js

@@ -3460,7 +3460,7 @@ module.exports = require("json-bigint");
 // 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-group/src/main.vue?vue&type=template&id=29d92df1&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=537e6aa3&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3663,6 +3663,7 @@ var render = function () {
                   _vm._g(
                     _vm._b(
                       {
+                        key: _vm.count,
                         ref: _vm.table.ref ? _vm.table.ref : "esDataTable",
                         attrs: { size: "mini", param: _vm.param },
                       },
@@ -3793,7 +3794,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=29d92df1&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=537e6aa3&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3972,6 +3973,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -4090,6 +4092,17 @@ var util = __webpack_require__(0);
           }
         }
       }
+    },
+    //监听table，变化后重新加载，解决点击树节点后改变table对象导致的样式错乱问题
+    table: {
+      handler: function handler(val) {
+        if (val) {
+          this.count++;
+        }
+      },
+
+      deep: true,
+      immediate: true
     }
   },
   data: function data() {
@@ -4097,6 +4110,7 @@ var util = __webpack_require__(0);
       active: '0',
       checkeds: null,
       params: null,
+      count: 0,
       wjprops: {}
     };
   },

package/package.json

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

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

@@ -4,6 +4,8 @@
     <template slot-scope="scope">
       <template v-if="isForm && !isReadOnly(scope)">
         <el-form-item
+          v-if="!(type === 'handle' && !scope.row.hideHandle)"
+          label-width="0"
           :name="name"
           :prop="field || prop"
           :rules="isNotRule(scope) ? [] : rules"
@@ -486,7 +488,7 @@ export default {
       type: Number,
       default: null
     },
-    data: Object,
+    data: [Object, Array],
     optionData: {
       type: Object,
       default() {

package/packages/main/src/main.vue

@@ -465,9 +465,31 @@ export default {
     },
     //隐藏操作按键
     hide() {
+      let mainConfig = JSON.parse(util.getStorage('mainConfig'));
+      let topRightToolHide = '';
+      if (
+        mainConfig &&
+        mainConfig.subsystemExtend &&
+        mainConfig.subsystemExtend.topRightToolHide
+      ) {
+        topRightToolHide = JSON.parse(
+          mainConfig.subsystemExtend.topRightToolHide.replace(
+            /(['"])?([a-zA-Z0-9_]+)(['"])?:/g,
+            '"$2":'
+          )
+        );
+      }
+      console.log(topRightToolHide);
+      console.log(
+        'Object.keys(topRightToolHide).length',
+        Object.keys(topRightToolHide).length
+      );
       if (this.layout === 'subsystem' || this.application) {
         if (this.hides && Object.keys(this.hides).length) {
           return { ...this.hides, set: !this.set, system: false };
+        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
+          console.log('topRightToolHide', topRightToolHide);
+          return { ...topRightToolHide, set: !this.set, system: false };
         } else {
           return { set: !this.set, system: false };
         }
@@ -479,6 +501,13 @@ export default {
             system: true,
             user: true
           };
+        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
+          return {
+            ...topRightToolHide,
+            set: !this.set,
+            system: true,
+            user: true
+          };
         } else {
           return { set: !this.set, system: true, user: true };
         }
@@ -490,6 +519,13 @@ export default {
             system: true,
             user: true
           };
+        } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
+          return {
+            ...topRightToolHide,
+            set: !this.set,
+            system: true,
+            user: true
+          };
         } else {
           return { set: !this.set, system: true };
         }

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

@@ -103,6 +103,7 @@
       >
       </es-tabs> -->
         <es-data-table
+          :key="count"
           v-else-if="table"
           size="mini"
           v-bind="{ close: true, ...table }"
@@ -298,6 +299,16 @@ export default {
           }
         }
       }
+    },
+    //监听table，变化后重新加载，解决点击树节点后改变table对象导致的样式错乱问题
+    table: {
+      handler(val) {
+        if (val) {
+          this.count++;
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   data() {
@@ -305,6 +316,7 @@ export default {
       active: '0',
       checkeds: null,
       params: null,
+      count: 0,
       wjprops: {}
     };
   },

package/src/index.js

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