eoss-ui 0.5.81-beta1 → 0.5.81-beta2

package/lib/data-table.js

@@ -3929,8 +3929,8 @@ module.exports = require("vue");
 // 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/data-table/src/main.vue?vue&type=template&id=825eabd0&
-var mainvue_type_template_id_825eabd0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=04c7a78c&
+var mainvue_type_template_id_04c7a78c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4241,10 +4241,10 @@ var mainvue_type_template_id_825eabd0_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_825eabd0_render._withStripped = true
+mainvue_type_template_id_04c7a78c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=825eabd0&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=04c7a78c&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -7217,8 +7217,8 @@ var mainvue_type_script_lang_js_components, _watch;
             _this9.list = _this9.list.concat(results.data || results.records || results.list);
             _this9.config.pageNum += 1;
           } else {
+            _this9.list = results.data || results.records || results.list;
             _this9.$nextTick(function () {
-              _this9.list = results.data || results.records || results.list || [];
               _this9.$refs.oaTable && _this9.$refs.oaTable.resetScroll && _this9.$refs.oaTable.resetScroll(0, 0);
             });
           }
@@ -7722,7 +7722,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_825eabd0_render,
+  mainvue_type_template_id_04c7a78c_render,
   staticRenderFns,
   false,
   null,

package/lib/eoss-ui.common.js

@@ -6879,8 +6879,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=825eabd0&
-var mainvue_type_template_id_825eabd0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=04c7a78c&
+var mainvue_type_template_id_04c7a78c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7190,11 +7190,11 @@ var mainvue_type_template_id_825eabd0_render = function () {
     1
   )
 }
-var mainvue_type_template_id_825eabd0_staticRenderFns = []
-mainvue_type_template_id_825eabd0_render._withStripped = true
+var mainvue_type_template_id_04c7a78c_staticRenderFns = []
+mainvue_type_template_id_04c7a78c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=825eabd0&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=04c7a78c&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 var childrenvue_type_template_id_44b7ff61_render = function () {
@@ -10152,8 +10152,8 @@ var mainvue_type_script_lang_js_components, _watch;
             _this9.list = _this9.list.concat(results.data || results.records || results.list);
             _this9.config.pageNum += 1;
           } else {
+            _this9.list = results.data || results.records || results.list;
             _this9.$nextTick(function () {
-              _this9.list = results.data || results.records || results.list || [];
               _this9.$refs.oaTable && _this9.$refs.oaTable.resetScroll && _this9.$refs.oaTable.resetScroll(0, 0);
             });
           }
@@ -10657,8 +10657,8 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_825eabd0_render,
-  mainvue_type_template_id_825eabd0_staticRenderFns,
+  mainvue_type_template_id_04c7a78c_render,
+  mainvue_type_template_id_04c7a78c_staticRenderFns,
   false,
   null,
   null,
@@ -46292,8 +46292,8 @@ handler_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_handler = (handler_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/icon/src/main.vue?vue&type=template&id=a33503bc&
-var mainvue_type_template_id_a33503bc_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/icon/src/main.vue?vue&type=template&id=446be86a&
+var mainvue_type_template_id_446be86a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -46316,11 +46316,11 @@ var mainvue_type_template_id_a33503bc_render = function () {
     )
   )
 }
-var mainvue_type_template_id_a33503bc_staticRenderFns = []
-mainvue_type_template_id_a33503bc_render._withStripped = true
+var mainvue_type_template_id_446be86a_staticRenderFns = []
+mainvue_type_template_id_446be86a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/icon/src/main.vue?vue&type=template&id=a33503bc&
+// CONCATENATED MODULE: ./packages/icon/src/main.vue?vue&type=template&id=446be86a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/icon/src/main.vue?vue&type=script&lang=js&
 //
@@ -46363,12 +46363,12 @@ mainvue_type_template_id_a33503bc_render._withStripped = true
               if (this.unicode(val)) {
                 this.code = '';
                 this.className = val;
-              } else if (utils_util["a" /* default */].startWith(val, '&#')) {
-                this.code = val;
-                this.className = 'es-icon';
-              } else {
+              } else if (this.isId(val)) {
                 this.tag = 'img';
                 this.url = this.preview + val;
+              } else {
+                this.code = val;
+                this.className = 'es-icon';
               }
             }
           } else {
@@ -46396,7 +46396,14 @@ mainvue_type_template_id_a33503bc_render._withStripped = true
       if (!res) {
         return false;
       }
-      var reg = new RegExp(/^[es-|el-]\S+/, 'g');
+      var reg = new RegExp(/^(es-|el-)\S+/, 'g');
+      return res.match(reg) ? res.match(reg).length : 0;
+    },
+    isId: function isId(res) {
+      if (!res) {
+        return false;
+      }
+      var reg = new RegExp(/[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-[a-z0-9]+\S+/, 'g');
       return res.match(reg) ? res.match(reg).length : 0;
     }
   }
@@ -46413,8 +46420,8 @@ mainvue_type_template_id_a33503bc_render._withStripped = true
 
 var icon_src_main_component = normalizeComponent(
   packages_icon_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_a33503bc_render,
-  mainvue_type_template_id_a33503bc_staticRenderFns,
+  mainvue_type_template_id_446be86a_render,
+  mainvue_type_template_id_446be86a_staticRenderFns,
   false,
   null,
   null,
@@ -50881,8 +50888,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// 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=25558994&
-var mainvue_type_template_id_25558994_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/main.vue?vue&type=template&id=6007ce2f&
+var mainvue_type_template_id_6007ce2f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50894,7 +50901,12 @@ var mainvue_type_template_id_25558994_render = function () {
         ? _c(
             "es-main-simplicity",
             _vm._g(
-              _vm._b({ ref: "main" }, "es-main-simplicity", _vm.$attrs, false),
+              _vm._b(
+                { ref: "main", attrs: { appCode: _vm.appCode } },
+                "es-main-simplicity",
+                _vm.$attrs,
+                false
+              ),
               _vm.$listeners
             )
           )
@@ -50909,14 +50921,14 @@ var mainvue_type_template_id_25558994_render = function () {
     1
   )
 }
-var mainvue_type_template_id_25558994_staticRenderFns = []
-mainvue_type_template_id_25558994_render._withStripped = true
+var mainvue_type_template_id_6007ce2f_staticRenderFns = []
+mainvue_type_template_id_6007ce2f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=25558994&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6007ce2f&
 
-// 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=36f16569&scoped=true&
-var simplicityvue_type_template_id_36f16569_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=d70a9674&scoped=true&
+var simplicityvue_type_template_id_d70a9674_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50969,6 +50981,7 @@ var simplicityvue_type_template_id_36f16569_scoped_true_render = function () {
                     {
                       key: item.id,
                       staticClass: "es-simplicity-side-app",
+                      class: { "is-active": _vm.active == item.id },
                       attrs: { title: item.text || item.name },
                       on: {
                         click: function ($event) {
@@ -51486,11 +51499,11 @@ var simplicityvue_type_template_id_36f16569_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_36f16569_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_36f16569_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_d70a9674_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_d70a9674_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=36f16569&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=d70a9674&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=7a5313dd&scoped=true&
 var avatarvue_type_template_id_7a5313dd_scoped_true_render = function () {
@@ -54907,6 +54920,7 @@ var simplicityvue_type_script_lang_js_this = undefined;
 //
 //
 //
+//
 
 
 
@@ -54977,6 +54991,7 @@ var events = [function (tabs, index) {
     settings: settings
   },
   props: {
+    appCode: String,
     //logo
     logo: String,
     //菜单、应用默认图标
@@ -55130,7 +55145,9 @@ var events = [function (tabs, index) {
       //显示页签操作
       showTabsHandler: false,
       //页签对象
-      pane: null
+      pane: null,
+      //选中菜单
+      active: ''
     };
   },
 
@@ -55701,6 +55718,7 @@ var events = [function (tabs, index) {
             }
           }
         }
+        this.active = res.id;
       } else {
         this.showMenu = false;
         this.showApps = !this.showApps;
@@ -56176,11 +56194,11 @@ var events = [function (tabs, index) {
 
 var simplicity_component = normalizeComponent(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_36f16569_scoped_true_render,
-  simplicityvue_type_template_id_36f16569_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_d70a9674_scoped_true_render,
+  simplicityvue_type_template_id_d70a9674_scoped_true_staticRenderFns,
   false,
   null,
-  "36f16569",
+  "d70a9674",
   null
   
 )
@@ -60320,6 +60338,7 @@ var default_component = normalizeComponent(
 //
 //
 //
+//
 
 
 
@@ -60343,10 +60362,13 @@ var default_component = normalizeComponent(
   computed: {},
   watch: {},
   data: function data() {
-    return {};
+    return {
+      appCode: ''
+    };
   },
   created: function created() {
     var params = utils_util["a" /* default */].getParams() || {};
+    this.appCode = params.appCode;
     this.getConfig(params);
   },
   mounted: function mounted() {},
@@ -60386,8 +60408,8 @@ var default_component = normalizeComponent(
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_25558994_render,
-  mainvue_type_template_id_25558994_staticRenderFns,
+  mainvue_type_template_id_6007ce2f_render,
+  mainvue_type_template_id_6007ce2f_staticRenderFns,
   false,
   null,
   null,
@@ -80574,7 +80596,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.81-beta1',
+  version: '0.5.81-beta2',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/icon.js

@@ -3725,7 +3725,7 @@ 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/icon/src/main.vue?vue&type=template&id=a33503bc&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/icon/src/main.vue?vue&type=template&id=446be86a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3753,7 +3753,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/icon/src/main.vue?vue&type=template&id=a33503bc&
+// CONCATENATED MODULE: ./packages/icon/src/main.vue?vue&type=template&id=446be86a&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3802,12 +3802,12 @@ var api = __webpack_require__(1);
               if (this.unicode(val)) {
                 this.code = '';
                 this.className = val;
-              } else if (util["a" /* default */].startWith(val, '&#')) {
-                this.code = val;
-                this.className = 'es-icon';
-              } else {
+              } else if (this.isId(val)) {
                 this.tag = 'img';
                 this.url = this.preview + val;
+              } else {
+                this.code = val;
+                this.className = 'es-icon';
               }
             }
           } else {
@@ -3835,7 +3835,14 @@ var api = __webpack_require__(1);
       if (!res) {
         return false;
       }
-      var reg = new RegExp(/^[es-|el-]\S+/, 'g');
+      var reg = new RegExp(/^(es-|el-)\S+/, 'g');
+      return res.match(reg) ? res.match(reg).length : 0;
+    },
+    isId: function isId(res) {
+      if (!res) {
+        return false;
+      }
+      var reg = new RegExp(/[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-[a-z0-9]+\S+/, 'g');
       return res.match(reg) ? res.match(reg).length : 0;
     }
   }