eoss-ui 0.4.87 → 0.4.88

package/lib/main.js

@@ -3484,7 +3484,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=4b1d4233&
+// 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=5d84af02&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3914,7 +3914,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=4b1d4233&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=5d84af02&
 
 // 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 () {
@@ -6335,13 +6335,9 @@ var log = util["a" /* default */].getParams('console');
     };
   },
   created: function created() {
+    this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
     this.isHeader = util["a" /* default */].getParams('header');
     this.getConfig();
-    if (this.remote) {
-      this.getMenu();
-    } else {
-      this.renderMenu();
-    }
     if (this.socket) {
       this.initWebSocket();
     }
@@ -6551,12 +6547,8 @@ var log = util["a" /* default */].getParams('console');
         if (i === 'initApplication' && results[i]) {
           this.results[i] = results[i].split(',');
         }
-        if (this.loadHomePage) {
-          if (typeof this.loadHomePage === 'string') {
-            this.homePage = this.loadHomePage;
-          } else if (i === 'indexUrl') {
-            this.homePage = results[i];
-          }
+        if (i === 'indexUrl' && this.loadHomePage) {
+          this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : results[i];
           if (this.isHomePage && this.homePage) {
             if (this.menus && this.menus.length) {
               var ids = null;
@@ -6569,7 +6561,6 @@ var log = util["a" /* default */].getParams('console');
               this.setMenu(this.menus);
             }
           }
-          //this.isHomePage && this.handleJump(this.homePage);
         }
         if (i === 'doorIndex' && results[i]) {
           window.open(results[i]);
@@ -6608,11 +6599,21 @@ var log = util["a" /* default */].getParams('console');
       if (util["a" /* default */].getStorage('mainConfig')) {
         var results = JSON.parse(util["a" /* default */].getStorage('mainConfig'));
         this.setConfig(results);
+        if (this.remote) {
+          this.getMenu();
+        } else {
+          this.renderMenu();
+        }
         return true;
       }
       util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           _this3.setConfig(res.results, 1);
+          if (_this3.remote) {
+            _this3.getMenu();
+          } else {
+            _this3.renderMenu();
+          }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
           _this3.$message.error(msg);

package/package.json

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

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

@@ -449,7 +449,12 @@ export default {
     },
     theads: {
       get() {
-        return typeof this.thead === 'string' ? this.theadData : this.thead;
+        if (typeof this.thead === 'string') {
+          this.theadData.length && this.setMinWidth(this.theadData);
+          return this.theadData;
+        }
+        this.setMinWidth(this.thead);
+        return this.thead;
       },
       set(val) {
         return val;
@@ -602,6 +607,7 @@ export default {
       this.getOptions(this.thead);
     }
     this.immediate && this.getTableData();
+    this.chekOpenTotalArea();
   },
   mounted() {
     this.datas.length && this.checkSelect(this.checked);
@@ -627,20 +633,22 @@ export default {
       }
       return false;
     },
-    getOptions(res) {
-      res.forEach((item) => {
-        if (
-          (!item.childHead || !item.childHead.length) &&
-          (!item.children || !item.children.length) &&
-          !item.width &&
-          !item.minWidth &&
-          item.title
-        ) {
+    setMinWidth(obj) {
+      obj.forEach((item) => {
+        if (item.childHead && item.childHead.length) {
+          this.setMinWidth(item.childHead);
+        } else if (item.children && item.children.length) {
+          this.setMinWidth(item.children);
+        } else if (!item.width && !item.minWidth && item.title) {
           let width = item.title.length * 14 + 20;
           if (width > 80) {
             this.$set(item, 'minWidth', width);
           }
         }
+      });
+    },
+    getOptions(res) {
+      res.forEach((item) => {
         if (item.sysCode || item.url) {
           let params = util.extend(
             {},

package/packages/form/src/main.vue

@@ -5033,7 +5033,7 @@ export default {
       }
       let obj = JSON.parse(JSON.stringify(models));
       if (this.within) {
-        //within:把提交数据装到指定属性中
+        //within:把提交数据装到指定属性中(分表)
         let newData = {};
         if (typeof this.within === 'string') {
           newData[this.within] = obj;

package/packages/main/src/main.vue

@@ -621,13 +621,10 @@ export default {
     };
   },
   created() {
+    this.homePage =
+      typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
     this.isHeader = util.getParams('header');
     this.getConfig();
-    if (this.remote) {
-      this.getMenu();
-    } else {
-      this.renderMenu();
-    }
     if (this.socket) {
       this.initWebSocket();
     }
@@ -848,12 +845,11 @@ export default {
         if (i === 'initApplication' && results[i]) {
           this.results[i] = results[i].split(',');
         }
-        if (this.loadHomePage) {
-          if (typeof this.loadHomePage === 'string') {
-            this.homePage = this.loadHomePage;
-          } else if (i === 'indexUrl') {
-            this.homePage = results[i];
-          }
+        if (i === 'indexUrl' && this.loadHomePage) {
+          this.homePage =
+            typeof this.loadHomePage === 'string'
+              ? this.loadHomePage
+              : results[i];
           if (this.isHomePage && this.homePage) {
             if (this.menus && this.menus.length) {
               let ids = null;
@@ -866,7 +862,6 @@ export default {
               this.setMenu(this.menus);
             }
           }
-          //this.isHomePage && this.handleJump(this.homePage);
         }
         if (i === 'doorIndex' && results[i]) {
           window.open(results[i]);
@@ -902,6 +897,11 @@ export default {
       if (util.getStorage('mainConfig')) {
         const results = JSON.parse(util.getStorage('mainConfig'));
         this.setConfig(results);
+        if (this.remote) {
+          this.getMenu();
+        } else {
+          this.renderMenu();
+        }
         return true;
       }
       util
@@ -909,6 +909,11 @@ export default {
         .then((res) => {
           if (res && res.rCode === 0) {
             this.setConfig(res.results, 1);
+            if (this.remote) {
+              this.getMenu();
+            } else {
+              this.renderMenu();
+            }
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);

package/src/index.js

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