eoss-ui 0.6.40 → 0.6.41

package/lib/flow-group.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/flow-list.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/flow.js

@@ -559,6 +559,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -612,8 +613,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;
@@ -4342,7 +4347,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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/flow/src/main.vue?vue&type=template&id=2feffd01&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=5d052dc2&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6453,7 +6458,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=2feffd01&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5d052dc2&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(14);
@@ -7462,8 +7467,8 @@ var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=3ec67af0&
-var processFormvue_type_template_id_3ec67af0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=4c3e6186&
+var processFormvue_type_template_id_4c3e6186_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7984,11 +7989,11 @@ var processFormvue_type_template_id_3ec67af0_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_3ec67af0_staticRenderFns = []
-processFormvue_type_template_id_3ec67af0_render._withStripped = true
+var processFormvue_type_template_id_4c3e6186_staticRenderFns = []
+processFormvue_type_template_id_4c3e6186_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=3ec67af0&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=4c3e6186&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=615d0e78&
 var selectUservue_type_template_id_615d0e78_render = function () {
@@ -9867,7 +9872,6 @@ var processFormvue_type_script_lang_js_components;
     this.getUserInfo();
   },
   mounted: function mounted() {
-    console.log('发起流程开始');
     this.getNodeType();
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
@@ -10101,7 +10105,11 @@ var processFormvue_type_script_lang_js_components;
             newParm.submitTaskParamJson = JSON.stringify(_this4.taskParams);
             params = newParm;
           }
-          util["a" /* default */].ajax({ url: _this4.isFreeStartFlow ? api["z" /* freeStartFlowWithSubmitTask */] : api["pb" /* register */], method: 'post', data: params }).then(function (res) {
+          util["a" /* default */].ajax({
+            url: _this4.isFreeStartFlow ? api["z" /* freeStartFlowWithSubmitTask */] : api["pb" /* register */],
+            method: 'post',
+            data: params
+          }).then(function (res) {
             var status = res.status,
                 message = res.message;
 
@@ -10403,8 +10411,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = Object(componentNormalizer["a" /* default */])(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_3ec67af0_render,
-  processFormvue_type_template_id_3ec67af0_staticRenderFns,
+  processFormvue_type_template_id_4c3e6186_render,
+  processFormvue_type_template_id_4c3e6186_staticRenderFns,
   false,
   null,
   null,
@@ -12902,8 +12910,8 @@ var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var startTaskRead = (startTaskRead_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=template&id=138bb789&
-var resetvue_type_template_id_138bb789_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=template&id=2b7d4b66&
+var resetvue_type_template_id_2b7d4b66_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13334,11 +13342,11 @@ var resetvue_type_template_id_138bb789_render = function () {
     1
   )
 }
-var resetvue_type_template_id_138bb789_staticRenderFns = []
-resetvue_type_template_id_138bb789_render._withStripped = true
+var resetvue_type_template_id_2b7d4b66_staticRenderFns = []
+resetvue_type_template_id_2b7d4b66_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=138bb789&
+// CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=2b7d4b66&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=script&lang=js&
 var resetvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -14120,7 +14128,6 @@ var resetvue_type_script_lang_js_components;
           _this7.readOnlyNotificationType = data.readOnlyNotificationType;
           _this7.notificationMessageReadOnly = data.notificationMessageReadOnly == 'true';
           var flowList = [];
-          console.log(data.taskNodeList);
           if (data.taskNodeList && data.taskNodeList.length > 0) {
             for (var key in data.taskNodeList[0]) {
               flowList.push({
@@ -14138,7 +14145,6 @@ var resetvue_type_script_lang_js_components;
           }
 
           _this7.nextNode.nodeInfo = flowList;
-          console.log(_this7.nextNode.nodeInfo, 'this.nextNode.nodeInfo');
           _this7.nextNode.nextNode = flowList[0].nodeId;
           _this7.taskExamine = data.taskExamine;
           _this7.processDefinitionId = data.taskExamine.processDefinitionId;
@@ -14198,8 +14204,8 @@ var resetvue_type_script_lang_js_components;
 
 var reset_component = Object(componentNormalizer["a" /* default */])(
   src_resetvue_type_script_lang_js_,
-  resetvue_type_template_id_138bb789_render,
-  resetvue_type_template_id_138bb789_staticRenderFns,
+  resetvue_type_template_id_2b7d4b66_render,
+  resetvue_type_template_id_2b7d4b66_staticRenderFns,
   false,
   null,
   null,
@@ -14208,8 +14214,8 @@ var reset_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var src_reset = (reset_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=e8b3de86&
-var taskUnionExaminevue_type_template_id_e8b3de86_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=3d269602&
+var taskUnionExaminevue_type_template_id_3d269602_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14448,7 +14454,7 @@ var taskUnionExaminevue_type_template_id_e8b3de86_render = function () {
               attrs: { type: "primary", size: "small" },
               on: { click: _vm.subMit },
             },
-            [_vm._v("\n          确定\n        ")]
+            [_vm._v(" 确定 ")]
           ),
           _c(
             "el-button",
@@ -14462,11 +14468,11 @@ var taskUnionExaminevue_type_template_id_e8b3de86_render = function () {
     1
   )
 }
-var taskUnionExaminevue_type_template_id_e8b3de86_staticRenderFns = []
-taskUnionExaminevue_type_template_id_e8b3de86_render._withStripped = true
+var taskUnionExaminevue_type_template_id_3d269602_staticRenderFns = []
+taskUnionExaminevue_type_template_id_3d269602_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=e8b3de86&
+// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=3d269602&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=script&lang=js&
 var taskUnionExaminevue_type_script_lang_js_components;
@@ -14600,9 +14606,6 @@ var taskUnionExaminevue_type_script_lang_js_components;
 //
 //
 //
-//
-//
-//
 
 
 
@@ -14784,7 +14787,9 @@ var taskUnionExaminevue_type_script_lang_js_components;
               _this3.currentOrgTabs = res.data.customizedConfig.currentOrgSelectorItemList.split(',');
               var param = res.data.customizedConfig.currentOrgSelectorRangeList.split(',');
               _this3.currentOrgTabs.map(function (x, i) {
-                _this3.params[x] = { filid: param[i] == 'my' ? _this3.params.filid = JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId : param[i] };
+                _this3.params[x] = {
+                  filid: param[i] == 'my' ? _this3.params.filid = JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId : param[i]
+                };
               });
             } else {
               if (_this3.type == 'takeAdvice') {
@@ -14888,7 +14893,6 @@ var taskUnionExaminevue_type_script_lang_js_components;
         method: 'POST'
       };
       this.loading = true;
-      console.log(param.data, nextCurrentOrgObj, 'data');
       util["a" /* default */].ajax(param).then(function (res) {
         var message = res.message,
             status = res.status;
@@ -15023,8 +15027,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
 
 var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
   component_taskUnionExaminevue_type_script_lang_js_,
-  taskUnionExaminevue_type_template_id_e8b3de86_render,
-  taskUnionExaminevue_type_template_id_e8b3de86_staticRenderFns,
+  taskUnionExaminevue_type_template_id_3d269602_render,
+  taskUnionExaminevue_type_template_id_3d269602_staticRenderFns,
   false,
   null,
   null,
@@ -22298,7 +22302,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
             _this27.value = _this27.value.replace(RegExp('同意。', 'g'), '');
             _this27.value = val + _this27.value;
           }
-          console.log(112);
           if (!_this27.validInfo()) {
             _this27.freeValid = false;
             return;
@@ -22343,7 +22346,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         return false;
       }
       if (!this.value && this.isOpinionRequired === 1) {
-        console.log(1);
         this.$message.warning('请选择输入审批意见');
         return false;
       }

package/lib/form.js

@@ -559,6 +559,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -612,8 +613,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/handle-user.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/handler.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;
@@ -3987,7 +3992,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/handler/src/main.vue?vue&type=template&id=5095bbf9&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=781785ca&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4037,7 +4042,7 @@ var render = function () {
                           ),
                         ]
                       )
-                    : item.type === "date"
+                    : item.type === "dateTime"
                     ? _c("div", { staticClass: "es-handler-date" }, [
                         _c("div", [
                           _vm._v(
@@ -4078,7 +4083,7 @@ var render = function () {
                             placement: "bottom",
                             trigger: "hover",
                             "popper-class":
-                              _vm.system.length > 4
+                              _vm.systemData.length > 4
                                 ? "es-popper-sub-system is-width"
                                 : "es-popper-sub-system",
                           },
@@ -4092,7 +4097,7 @@ var render = function () {
                           },
                         },
                         [
-                          _vm.system.length
+                          _vm.systemData.length
                             ? _c(
                                 "el-scrollbar",
                                 { attrs: { "max-height": _vm.maxHeight } },
@@ -4100,7 +4105,7 @@ var render = function () {
                                   _c(
                                     "ul",
                                     { staticClass: "es-sub-system" },
-                                    _vm._l(_vm.system, function (ele) {
+                                    _vm._l(_vm.systemData, function (ele) {
                                       return _c(
                                         "li",
                                         {
@@ -4191,9 +4196,9 @@ var render = function () {
                         {
                           staticClass: "es-badge",
                           attrs: {
-                            value: _vm.notice,
+                            value: _vm.noticeNum,
                             max: 99,
-                            hidden: _vm.notice < 1,
+                            hidden: _vm.noticeNum < 1,
                           },
                         },
                         [
@@ -4235,7 +4240,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=5095bbf9&
+// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=781785ca&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4246,6 +4251,8 @@ var util = __webpack_require__(0);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=script&lang=js&
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _props;
+
 //
 //
 //
@@ -4372,7 +4379,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       default: ''
     }
   },
-  props: {
+  props: (_props = {
     contact: Object,
     jobScrollbar: Boolean,
     data: Array,
@@ -4387,20 +4394,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         return [];
       }
     },
-    notice: {
-      type: Number,
-      default: 0
-    },
     hide: {
       type: Object,
       default: function _default() {
-        return { system: true, new: true };
+        return {};
       }
     },
-    online: {
-      type: [Number, Boolean],
-      default: 1
-    },
     photo: String,
     storage: String,
     application: {
@@ -4410,8 +4409,128 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     maxHeight: {
       type: String,
       default: '100%'
+    },
+    user: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'user'
+        };
+      }
+    },
+    dateTime: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'dateTime'
+        };
+      }
+    },
+    system: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'system',
+          icon: 'es-icon-yingyong',
+          title: '切换子系统'
+        };
+      }
+    },
+    home: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'home',
+          icon: 'es-icon-zuomian',
+          title: '个人工作台'
+        };
+      }
+    },
+    search: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'search',
+          icon: 'es-icon-magnifier',
+          title: '搜索'
+        };
+      }
+    },
+    im: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'im',
+          icon: 'es-icon-liaotian',
+          title: 'IM'
+        };
+      }
+    },
+    index: {
+      type: Object,
+      default: function _default() {
+        return {
+          type: 'index',
+          icon: 'es-icon-home',
+          title: '门户'
+        };
+      }
     }
-  },
+  }, _props['home'] = {
+    type: Object,
+    default: function _default() {
+      return {
+        type: 'home',
+        icon: 'es-icon-zuomian',
+        title: '个人工作台'
+      };
+    }
+  }, _props.notice = {
+    type: Object,
+    default: function _default() {
+      return {
+        type: 'notice',
+        icon: 'es-icon-tongzhi',
+        title: '通知消息'
+      };
+    }
+  }, _props.refresh = {
+    type: Object,
+    default: function _default() {
+      return {
+        type: 'refresh',
+        icon: 'es-icon-shuaxin',
+        title: '刷新'
+      };
+    }
+  }, _props.quit = {
+    type: Object,
+    default: function _default() {
+      return {
+        type: 'quit',
+        icon: 'es-icon-guanji',
+        title: '退出'
+      };
+    }
+  }, _props.set = {
+    type: Object,
+    default: function _default() {
+      return {
+        type: 'set',
+        icon: 'es-icon-xitongguanli',
+        title: '设置'
+      };
+    }
+  }, _props.msgNum = {
+    type: Number,
+    default: 0
+  }, _props.noticeNum = {
+    type: Number,
+    default: 0
+  }, _props.online = {
+    type: Number,
+    default: 1
+  }, _props),
   watch: {
     subSystem: {
       handler: function handler(val) {
@@ -4424,60 +4543,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   },
   computed: {
     lists: function lists() {
-      var _this = this;
-
-      if (this.data === undefined) {
-        var list = [{
-          type: 'user'
-        }, this.contact ? _extends({}, this.contact, { type: 'contact' }) : {}, {
-          type: 'date'
-        }, {
-          type: 'system',
-          icon: 'es-icon-yingyong',
-          title: '切换子系统'
-        }, {
-          type: 'home',
-          icon: 'es-icon-zuomian',
-          title: '个人工作台'
-        }, {
-          type: 'index',
-          icon: 'es-icon-home',
-          title: '门户'
-        }, {
-          type: 'notice',
-          icon: 'es-icon-tongzhi',
-          title: '通知消息'
-        }, {
-          type: 'refresh',
-          icon: 'es-icon-shuaxin',
-          title: '刷新'
-        }, {
-          type: 'quit',
-          icon: 'es-icon-guanji',
-          title: '退出'
-        }, {
-          type: 'set',
-          icon: 'es-icon-xitongguanli',
-          title: '设置'
-        }].filter(function (item) {
-          return Object.keys(item).length;
-        });
-        if (Object.keys(this.hide).length) {
-          list.forEach(function (item) {
-            item.hide = _this.hide[item.type];
-          });
-        }
-        return list;
-      } else {
-        if (Object.keys(this.hide).length) {
-          this.data.forEach(function (item) {
-            item.hide = _this.hide[item.type];
-          });
-        }
-      }
-      return this.data;
+      var hide = _extends({
+        system: true,
+        new: true,
+        im: true
+      }, this.hide);
+      var data = this.data ? this.data : [this.user, this.contact ? _extends({}, this.contact, { type: 'contact' }) : {}, this.dateTime, this.system, this.search, this.im, this.index, this.home, this.notice, this.refresh, this.quit, this.set];
+      return data.filter(function (item) {
+        return item && Object.keys(item).length && !item.hide && !hide[item.type];
+      });
     },
-    system: function system() {
+    systemData: function systemData() {
       return this.subSystem;
     },
     show: function show() {
@@ -4542,7 +4618,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       }
     },
     handleQuit: function handleQuit() {
-      var _this2 = this;
+      var _this = this;
 
       this.$confirm('确定退出吗?', '退出系统', {
         confirmButtonText: '确定',
@@ -4552,8 +4628,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         util["a" /* default */].ajax({ method: 'post', url: api["gb" /* logout */] }).then(function (res) {
           if (res.rCode == 0) {
             util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-            if (_this2.onQuit && typeof _this2.onQuit === 'function') {
-              _this2.onQuit();
+            if (_this.onQuit && typeof _this.onQuit === 'function') {
+              _this.onQuit();
             } else {
               try {
                 var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
@@ -4591,7 +4667,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
-            _this2.$message.error(err.message);
+            _this.$message.error(err.message);
           }
         });
       }).catch(function (e) {});