eoss-ui 0.4.86 → 0.4.88

package/lib/upload.js

@@ -3398,8 +3398,8 @@ module.exports = require("qs");
 // 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/upload/src/main.vue?vue&type=template&id=df2dc078&
-var mainvue_type_template_id_df2dc078_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=3bdc3f65&
+var mainvue_type_template_id_3bdc3f65_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3779,10 +3779,10 @@ var mainvue_type_template_id_df2dc078_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_df2dc078_render._withStripped = true
+mainvue_type_template_id_3bdc3f65_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=df2dc078&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=3bdc3f65&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4266,7 +4266,7 @@ var _props;
       return this.showFileList;
     },
     url: function url() {
-      var url = this.action ? this.action : this.portrait || !this.multiple ? api["Wb" /* uploadOnlyOne */] : api["Yb" /* uploads */];
+      var url = this.action ? this.action : this.portrait ? api["Wb" /* uploadOnlyOne */] : api["Yb" /* uploads */];
       return url.indexOf(this.host) > -1 ? url : this.host + url;
     },
     excludes: function excludes() {
@@ -4848,7 +4848,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_df2dc078_render,
+  mainvue_type_template_id_3bdc3f65_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.86",
+  "version": "0.4.88",
   "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.69",
+    "eoss-element": "^0.2.71",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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,6 +633,20 @@ export default {
       }
       return false;
     },
+    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) {
@@ -1276,6 +1296,10 @@ export default {
             } else {
               console.warn(this.$el.parentNode, `获取不到高度！`);
             }
+          } else if (!warn) {
+            setTimeout(() => {
+              this.resetHeight(true);
+            }, 1000);
           }
         }
       });

package/packages/form/src/main.vue

@@ -243,9 +243,7 @@
                       <es-label
                         slot="label"
                         v-if="
-                          item.showLabel !== false &&
-                          item.type !== 'table' &&
-                          showLabel
+                          item.showLabel !== false && item.label && showLabel
                         "
                         :contents="item.label"
                         v-bind="
@@ -1184,11 +1182,7 @@
                 >
                   <es-label
                     slot="label"
-                    v-if="
-                      item.showLabel !== false &&
-                      item.type !== 'table' &&
-                      showLabel
-                    "
+                    v-if="item.showLabel !== false && item.label && showLabel"
                     :contents="item.label"
                     v-bind="
                       item.label
@@ -2154,11 +2148,7 @@
                   >
                     <es-label
                       slot="label"
-                      v-if="
-                        item.showLabel !== false &&
-                        item.type !== 'table' &&
-                        showLabel
-                      "
+                      v-if="item.showLabel !== false && item.label && showLabel"
                       :contents="item.label"
                       v-bind="
                         item.label
@@ -3048,11 +3038,7 @@
               >
                 <es-label
                   slot="label"
-                  v-if="
-                    item.showLabel !== false &&
-                    item.type !== 'table' &&
-                    showLabel
-                  "
+                  v-if="item.showLabel !== false && item.label && showLabel"
                   :contents="item.label"
                   v-bind="
                     item.label
@@ -5047,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/form/src/table.vue

@@ -110,7 +110,7 @@
                 :rowspan="item.labelRow"
               >
                 <es-label
-                  v-if="item.type !== 'table'"
+                  v-if="item.showLabel !== false && item.label"
                   :contents="item.label"
                   v-bind="
                     item.label

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/packages/nav/src/main.vue

@@ -156,7 +156,7 @@ export default {
             }
             this.menu.forEach((item) => {
               if (item.id === this.active) {
-                this.subMenu = item.children;
+                this.subMenu = item.children || [];
                 this.headline = this.title ? this.title : item.text;
                 return;
               }
@@ -180,7 +180,7 @@ export default {
           }
           val.forEach((item) => {
             if (item.id === this.active) {
-              this.subMenu = item.children;
+              this.subMenu = item.children || [];
               this.headline = this.title ? this.title : item.text;
               return;
             }