eoss-ui 0.4.86 → 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/lib/nav.js

@@ -3405,7 +3405,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/nav/src/main.vue?vue&type=template&id=1f39eb2e&
+// 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=74f295ae&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3548,7 +3548,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=1f39eb2e&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=74f295ae&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3703,7 +3703,7 @@ var util = __webpack_require__(0);
             }
             this.menu.forEach(function (item) {
               if (item.id === _this.active) {
-                _this.subMenu = item.children;
+                _this.subMenu = item.children || [];
                 _this.headline = _this.title ? _this.title : item.text;
                 return;
               }
@@ -3725,7 +3725,7 @@ var util = __webpack_require__(0);
           }
           val.forEach(function (item) {
             if (item.id === _this2.active) {
-              _this2.subMenu = item.children;
+              _this2.subMenu = item.children || [];
               _this2.headline = _this2.title ? _this2.title : item.text;
               return;
             }

package/lib/table-form.js

@@ -3444,8 +3444,8 @@ 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/form/src/table.vue?vue&type=template&id=13819cef&
-var tablevue_type_template_id_13819cef_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=b2377b8c&
+var tablevue_type_template_id_b2377b8c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3627,7 +3627,7 @@ var tablevue_type_template_id_13819cef_render = function () {
                                         },
                                       },
                                       [
-                                        item.type !== "table"
+                                        item.showLabel !== false && item.label
                                           ? _c(
                                               "es-label",
                                               _vm._b(
@@ -6097,10 +6097,10 @@ var tablevue_type_template_id_13819cef_render = function () {
   )
 }
 var staticRenderFns = []
-tablevue_type_template_id_13819cef_render._withStripped = true
+tablevue_type_template_id_b2377b8c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=13819cef&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=b2377b8c&
 
 // EXTERNAL MODULE: ./src/utils/rules.js
 var rules = __webpack_require__(10);
@@ -7468,7 +7468,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_13819cef_render,
+  tablevue_type_template_id_b2377b8c_render,
   staticRenderFns,
   false,
   null,