eoss-ui 0.5.81-beta21 → 0.5.81-beta22

package/lib/main.js

@@ -3941,7 +3941,7 @@ module.exports = require("wujie-vue2");
 // 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=46c88986&
+// 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=a3c25372&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4015,10 +4015,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=46c88986&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=a3c25372&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=ded4ba88&scoped=true&
-var simplicityvue_type_template_id_ded4ba88_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=7188d482&scoped=true&
+var simplicityvue_type_template_id_7188d482_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4616,11 +4616,11 @@ var simplicityvue_type_template_id_ded4ba88_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_ded4ba88_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_ded4ba88_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_7188d482_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_7188d482_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=ded4ba88&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=7188d482&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=1560e8bf&scoped=true&
 var avatarvue_type_template_id_1560e8bf_scoped_true_render = function () {
@@ -8904,6 +8904,7 @@ var events = [function (tabs, index, that) {
       type: Boolean,
       default: true
     },
+    sysCode: String,
     appCode: String,
     //logo
     logo: String,
@@ -9407,8 +9408,9 @@ var events = [function (tabs, index, that) {
             _this2.setTips(_this2.menus);
             store["a" /* default */].set('nav', _this2.menus);
             if (_this2.appCode) {
+              var code = _this2.sysCode || _this2.appCode;
               var app = _this2.userApps.filter(function (item) {
-                return item.code === _this2.appCode;
+                return item.code === code;
               })[0];
               if (app) {
                 _this2.active = app.id;
@@ -9423,13 +9425,14 @@ var events = [function (tabs, index, that) {
                   }
                 }
               }
-              var ids = _this2.getId(_this2.menus, _this2.appCode);
-              var subMenus = void 0;
-              if (ids && Array.isArray(ids) && ids.length > 1) {
-                subMenus = _this2.getMenu(_this2.menus, ids[0], 'id');
+              if (_this2.sysCode) {
+                var subMenus = _this2.getMenu(_this2.menus, _this2.sysCode, 'appCode');
                 if (subMenus) {
-                  var _obj = _this2.getMenu(_this2.menus, ids[ids.length - 1], 'id');
+                  var _obj = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
                   if (_obj) {
+                    if (!_obj.url) {
+                      _obj = _this2.getFirst(_obj);
+                    }
                     _this2.subActive = _obj.id;
                     var _tab = _this2.setIframeType(_obj);
                     _this2.tabs = [_tab];
@@ -9437,12 +9440,17 @@ var events = [function (tabs, index, that) {
                   } else {
                     _this2.subActive = '';
                   }
+                  _this2.subMenus = subMenus;
+                  _this2.showMenu = true;
+                } else {
+                  _this2.subMenus = null;
+                  _this2.showMenu = false;
                 }
               } else {
-                subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-                if (subMenus) {
+                var _subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
+                if (_subMenus) {
                   if (_this2.tabs.length == 0) {
-                    var _obj2 = _this2.getFirst(subMenus);
+                    var _obj2 = _this2.getFirst(_subMenus);
                     if (_obj2) {
                       _this2.subActive = _obj2.id;
                       var _tab2 = _this2.setIframeType(_obj2);
@@ -9452,15 +9460,13 @@ var events = [function (tabs, index, that) {
                       _this2.subActive = '';
                     }
                   }
+                  _this2.subMenus = _subMenus;
+                  _this2.showMenu = true;
+                } else {
+                  _this2.subMenus = null;
+                  _this2.showMenu = false;
                 }
               }
-              if (subMenus) {
-                _this2.subMenus = subMenus;
-                _this2.showMenu = true;
-              } else {
-                _this2.subMenus = null;
-                _this2.showMenu = false;
-              }
             } else {
               if (_this2.indexUrl) {
                 var _obj3 = _this2.getMenu(_this2.menus, _this2.indexUrl);
@@ -10284,11 +10290,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_ded4ba88_scoped_true_render,
-  simplicityvue_type_template_id_ded4ba88_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_7188d482_scoped_true_render,
+  simplicityvue_type_template_id_7188d482_scoped_true_staticRenderFns,
   false,
   null,
-  "ded4ba88",
+  "7188d482",
   null
   
 )
@@ -14430,6 +14436,7 @@ var bus = external_wujie_vue2_default.a.bus;
   watch: {},
   data: function data() {
     return {
+      sysCode: '',
       appCode: '',
       params: {},
       dialogs: [],
@@ -14438,6 +14445,7 @@ var bus = external_wujie_vue2_default.a.bus;
   },
   created: function created() {
     this.params = util["a" /* default */].getParams() || {};
+    this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
     this.getConfig(this.params);
     // 主应用监听事件

package/package.json

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

package/packages/main/src/main.vue

@@ -64,6 +64,7 @@ export default {
   watch: {},
   data() {
     return {
+      sysCode: '',
       appCode: '',
       params: {},
       dialogs: [],
@@ -72,6 +73,7 @@ export default {
   },
   created() {
     this.params = util.getParams() || {};
+    this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
     this.getConfig(this.params);
     // 主应用监听事件

package/packages/main/src/simplicity/index.vue

@@ -408,6 +408,7 @@ export default {
       type: Boolean,
       default: true
     },
+    sysCode: String,
     appCode: String,
     //logo
     logo: String,
@@ -920,8 +921,9 @@ export default {
               this.setTips(this.menus);
               store.set('nav', this.menus);
               if (this.appCode) {
+                let code = this.sysCode || this.appCode;
                 let app = this.userApps.filter((item) => {
-                  return item.code === this.appCode;
+                  return item.code === code;
                 })[0];
                 if (app) {
                   this.active = app.id;
@@ -936,17 +938,18 @@ export default {
                     }
                   }
                 }
-                let ids = this.getId(this.menus, this.appCode);
-                let subMenus;
-                if (ids && Array.isArray(ids) && ids.length > 1) {
-                  subMenus = this.getMenu(this.menus, ids[0], 'id');
+                if (this.sysCode) {
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.sysCode,
+                    'appCode'
+                  );
                   if (subMenus) {
-                    let obj = this.getMenu(
-                      this.menus,
-                      ids[ids.length - 1],
-                      'id'
-                    );
+                    let obj = this.getMenu(this.menus, this.appCode, 'appCode');
                     if (obj) {
+                      if (!obj.url) {
+                        obj = this.getFirst(obj);
+                      }
                       this.subActive = obj.id;
                       let tab = this.setIframeType(obj);
                       this.tabs = [tab];
@@ -954,9 +957,18 @@ export default {
                     } else {
                       this.subActive = '';
                     }
+                    this.subMenus = subMenus;
+                    this.showMenu = true;
+                  } else {
+                    this.subMenus = null;
+                    this.showMenu = false;
                   }
                 } else {
-                  subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.appCode,
+                    'appCode'
+                  );
                   if (subMenus) {
                     if (this.tabs.length == 0) {
                       let obj = this.getFirst(subMenus);
@@ -969,15 +981,13 @@ export default {
                         this.subActive = '';
                       }
                     }
+                    this.subMenus = subMenus;
+                    this.showMenu = true;
+                  } else {
+                    this.subMenus = null;
+                    this.showMenu = false;
                   }
                 }
-                if (subMenus) {
-                  this.subMenus = subMenus;
-                  this.showMenu = true;
-                } else {
-                  this.subMenus = null;
-                  this.showMenu = false;
-                }
               } else {
                 if (this.indexUrl) {
                   let obj = this.getMenu(this.menus, this.indexUrl);

package/src/index.js

@@ -1,112 +1,112 @@
 /* Automatically generated by './build/bin/build-entry.js' */
 
-import Button from '../packages/button/index.js';
-import ButtonGroup from '../packages/button-group/index.js';
-import Calendar from '../packages/calendar/index.js';
-import Card from '../packages/card/index.js';
-import Cascader from '../packages/cascader/index.js';
-import CheckboxGroup from '../packages/checkbox-group/index.js';
-import Clients from '../packages/clients/index.js';
-import DataTable from '../packages/data-table/index.js';
-import DataTableForm from '../packages/data-table-form/index.js';
-import DatePicker from '../packages/date-picker/index.js';
-import Dialog from '../packages/dialog/index.js';
-import Enterprise from '../packages/enterprise/index.js';
-import ErrorPage from '../packages/error-page/index.js';
-import Form from '../packages/form/index.js';
-import Flow from '../packages/flow/index.js';
-import FlowGroup from '../packages/flow-group/index.js';
-import FlowList from '../packages/flow-list/index.js';
-import HandleUser from '../packages/handle-user/index.js';
-import Handler from '../packages/handler/index.js';
-import Icon from '../packages/icon/index.js';
-import Icons from '../packages/icons/index.js';
-import Input from '../packages/input/index.js';
-import InputNumber from '../packages/input-number/index.js';
-import Label from '../packages/label/index.js';
-import Layout from '../packages/layout/index.js';
-import Login from '../packages/login/index.js';
-import Main from '../packages/main/index.js';
-import Menu from '../packages/menu/index.js';
-import Nav from '../packages/nav/index.js';
-import Notify from '../packages/notify/index.js';
-import Pagination from '../packages/pagination/index.js';
-import Page from '../packages/page/index.js';
-import Player from '../packages/player/index.js';
-import QrCode from '../packages/qr-code/index.js';
-import RadioGroup from '../packages/radio-group/index.js';
-import RetrialAuth from '../packages/retrial-auth/index.js';
-import Select from '../packages/select/index.js';
-import SelectGanged from '../packages/select-ganged/index.js';
-import Selector from '../packages/selector/index.js';
-import SelectorPanel from '../packages/selector-panel/index.js';
-import Sizer from '../packages/sizer/index.js';
-import Steps from '../packages/steps/index.js';
-import Switch from '../packages/switch/index.js';
-import Tabs from '../packages/tabs/index.js';
-import TabsPanel from '../packages/tabs-panel/index.js';
-import Tips from '../packages/tips/index.js';
-import Tree from '../packages/tree/index.js';
-import TreeGroup from '../packages/tree-group/index.js';
-import Toolbar from '../packages/toolbar/index.js';
-import TableForm from '../packages/table-form/index.js';
-import Upload from '../packages/upload/index.js';
-import Wujie from '../packages/wujie/index.js';
+import Button from '../packages/button/index.js';
+import ButtonGroup from '../packages/button-group/index.js';
+import Calendar from '../packages/calendar/index.js';
+import Card from '../packages/card/index.js';
+import Cascader from '../packages/cascader/index.js';
+import CheckboxGroup from '../packages/checkbox-group/index.js';
+import Clients from '../packages/clients/index.js';
+import DataTable from '../packages/data-table/index.js';
+import DataTableForm from '../packages/data-table-form/index.js';
+import DatePicker from '../packages/date-picker/index.js';
+import Dialog from '../packages/dialog/index.js';
+import Enterprise from '../packages/enterprise/index.js';
+import ErrorPage from '../packages/error-page/index.js';
+import Form from '../packages/form/index.js';
+import Flow from '../packages/flow/index.js';
+import FlowGroup from '../packages/flow-group/index.js';
+import FlowList from '../packages/flow-list/index.js';
+import HandleUser from '../packages/handle-user/index.js';
+import Handler from '../packages/handler/index.js';
+import Icon from '../packages/icon/index.js';
+import Icons from '../packages/icons/index.js';
+import Input from '../packages/input/index.js';
+import InputNumber from '../packages/input-number/index.js';
+import Label from '../packages/label/index.js';
+import Layout from '../packages/layout/index.js';
+import Login from '../packages/login/index.js';
+import Main from '../packages/main/index.js';
+import Menu from '../packages/menu/index.js';
+import Nav from '../packages/nav/index.js';
+import Notify from '../packages/notify/index.js';
+import Pagination from '../packages/pagination/index.js';
+import Page from '../packages/page/index.js';
+import Player from '../packages/player/index.js';
+import QrCode from '../packages/qr-code/index.js';
+import RadioGroup from '../packages/radio-group/index.js';
+import RetrialAuth from '../packages/retrial-auth/index.js';
+import Select from '../packages/select/index.js';
+import SelectGanged from '../packages/select-ganged/index.js';
+import Selector from '../packages/selector/index.js';
+import SelectorPanel from '../packages/selector-panel/index.js';
+import Sizer from '../packages/sizer/index.js';
+import Steps from '../packages/steps/index.js';
+import Switch from '../packages/switch/index.js';
+import Tabs from '../packages/tabs/index.js';
+import TabsPanel from '../packages/tabs-panel/index.js';
+import Tips from '../packages/tips/index.js';
+import Tree from '../packages/tree/index.js';
+import TreeGroup from '../packages/tree-group/index.js';
+import Toolbar from '../packages/toolbar/index.js';
+import TableForm from '../packages/table-form/index.js';
+import Upload from '../packages/upload/index.js';
+import Wujie from '../packages/wujie/index.js';
 import Wxlogin from '../packages/wxlogin/index.js';
 
 const components = [
-  Button,
-  ButtonGroup,
-  Calendar,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 ];
 
@@ -121,59 +121,59 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.81-beta21',
+  version: '0.5.81-beta22',
   install,
-  Button,
-  ButtonGroup,
-  Calendar,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 };