eoss-ui 0.6.39 → 0.6.41

package/lib/form.js

@@ -547,10 +547,19 @@ var ajaxStream = function ajaxStream(_ref2) {
     if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
       params.userId = getStorage('userId');
     }
-    var info = {};
+    var info = {
+      time: 0,
+      conversationId: '',
+      content: '',
+      thinkContent: '',
+      primeval: '',
+      chunk: ''
+    };
     var partialData = '';
     var lastProcessedIndex = 0;
     var done = false;
+    var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -565,6 +574,9 @@ var ajaxStream = function ajaxStream(_ref2) {
         // 获取从上次处理后新增的数据
         var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
         var chunk = currentResponse.slice(lastProcessedIndex);
+        if (chunk === 'data:') {
+          return;
+        }
 
         // 更新偏移量
         lastProcessedIndex = currentResponse.length;
@@ -573,7 +585,12 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData += chunk;
         var lines = partialData.split('\n');
         var remainingData = ''; // 用于保存未完整处理的部分数据
+        var primeval = '';
+        var chunks = '';
         lines.forEach(function (line) {
+          if (line === '') {
+            return;
+          }
           if (line.startsWith('data:')) {
             var _data = line.replace('data:', '').trim();
             if (_data) {
@@ -582,8 +599,6 @@ var ajaxStream = function ajaxStream(_ref2) {
                 var parsedData = JSON.parse(_data);
                 info.time = parsedData.time;
                 info.conversationId = parsedData.conversationId;
-
-                // 使用正则表达式匹配 <think> 标签
                 var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
                 var match = parsedData.message.match(thinkRegex);
                 if (match) {
@@ -593,20 +608,47 @@ var ajaxStream = function ajaxStream(_ref2) {
                   info.thinkContent += thinkContent;
                   info.content += content;
                 } else {
-                  // 如果没有 <think> 标签，直接将消息内容赋值到 content
-                  info.content += parsedData.message;
+                  var startRegex = /<think>([\s\S]*)/;
+                  var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
+                  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;
+                      var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
+                      var _content = end[2] ? end[2].trim() : '';
+                      // 更新 AI 消息内容
+                      info.thinkContent += _thinkContent2;
+                      info.content += _content;
+                      chunks += _content;
+                    } else if (finishThink) {
+                      info.content += parsedData.message;
+                      chunks += parsedData.message;
+                    } else {
+                      info.thinkContent += parsedData.message;
+                    }
+                  }
                 }
+                primeval += parsedData.message;
                 done = parsedData.done;
               } catch (parseError) {
                 console.error('解析数据出错:', parseError);
               }
-              // Promise.resolve({message: info, controller});
             }
           } else {
             // 保存未处理完的部分数据
             remainingData += line + '\n';
           }
         });
+        info.primeval = primeval;
+        info.chunk = chunks;
 
         // 将未完整处理的数据保留到 partialData 中
         partialData = remainingData;

package/lib/handle-user.js

@@ -548,10 +548,19 @@ var ajaxStream = function ajaxStream(_ref2) {
     if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
       params.userId = getStorage('userId');
     }
-    var info = {};
+    var info = {
+      time: 0,
+      conversationId: '',
+      content: '',
+      thinkContent: '',
+      primeval: '',
+      chunk: ''
+    };
     var partialData = '';
     var lastProcessedIndex = 0;
     var done = false;
+    var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -566,6 +575,9 @@ var ajaxStream = function ajaxStream(_ref2) {
         // 获取从上次处理后新增的数据
         var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
         var chunk = currentResponse.slice(lastProcessedIndex);
+        if (chunk === 'data:') {
+          return;
+        }
 
         // 更新偏移量
         lastProcessedIndex = currentResponse.length;
@@ -574,7 +586,12 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData += chunk;
         var lines = partialData.split('\n');
         var remainingData = ''; // 用于保存未完整处理的部分数据
+        var primeval = '';
+        var chunks = '';
         lines.forEach(function (line) {
+          if (line === '') {
+            return;
+          }
           if (line.startsWith('data:')) {
             var _data = line.replace('data:', '').trim();
             if (_data) {
@@ -583,8 +600,6 @@ var ajaxStream = function ajaxStream(_ref2) {
                 var parsedData = JSON.parse(_data);
                 info.time = parsedData.time;
                 info.conversationId = parsedData.conversationId;
-
-                // 使用正则表达式匹配 <think> 标签
                 var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
                 var match = parsedData.message.match(thinkRegex);
                 if (match) {
@@ -594,20 +609,47 @@ var ajaxStream = function ajaxStream(_ref2) {
                   info.thinkContent += thinkContent;
                   info.content += content;
                 } else {
-                  // 如果没有 <think> 标签，直接将消息内容赋值到 content
-                  info.content += parsedData.message;
+                  var startRegex = /<think>([\s\S]*)/;
+                  var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
+                  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;
+                      var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
+                      var _content = end[2] ? end[2].trim() : '';
+                      // 更新 AI 消息内容
+                      info.thinkContent += _thinkContent2;
+                      info.content += _content;
+                      chunks += _content;
+                    } else if (finishThink) {
+                      info.content += parsedData.message;
+                      chunks += parsedData.message;
+                    } else {
+                      info.thinkContent += parsedData.message;
+                    }
+                  }
                 }
+                primeval += parsedData.message;
                 done = parsedData.done;
               } catch (parseError) {
                 console.error('解析数据出错:', parseError);
               }
-              // Promise.resolve({message: info, controller});
             }
           } else {
             // 保存未处理完的部分数据
             remainingData += line + '\n';
           }
         });
+        info.primeval = primeval;
+        info.chunk = chunks;
 
         // 将未完整处理的数据保留到 partialData 中
         partialData = remainingData;

package/lib/handler.js

@@ -548,10 +548,19 @@ var ajaxStream = function ajaxStream(_ref2) {
     if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
       params.userId = getStorage('userId');
     }
-    var info = {};
+    var info = {
+      time: 0,
+      conversationId: '',
+      content: '',
+      thinkContent: '',
+      primeval: '',
+      chunk: ''
+    };
     var partialData = '';
     var lastProcessedIndex = 0;
     var done = false;
+    var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -566,6 +575,9 @@ var ajaxStream = function ajaxStream(_ref2) {
         // 获取从上次处理后新增的数据
         var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
         var chunk = currentResponse.slice(lastProcessedIndex);
+        if (chunk === 'data:') {
+          return;
+        }
 
         // 更新偏移量
         lastProcessedIndex = currentResponse.length;
@@ -574,7 +586,12 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData += chunk;
         var lines = partialData.split('\n');
         var remainingData = ''; // 用于保存未完整处理的部分数据
+        var primeval = '';
+        var chunks = '';
         lines.forEach(function (line) {
+          if (line === '') {
+            return;
+          }
           if (line.startsWith('data:')) {
             var _data = line.replace('data:', '').trim();
             if (_data) {
@@ -583,8 +600,6 @@ var ajaxStream = function ajaxStream(_ref2) {
                 var parsedData = JSON.parse(_data);
                 info.time = parsedData.time;
                 info.conversationId = parsedData.conversationId;
-
-                // 使用正则表达式匹配 <think> 标签
                 var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
                 var match = parsedData.message.match(thinkRegex);
                 if (match) {
@@ -594,20 +609,47 @@ var ajaxStream = function ajaxStream(_ref2) {
                   info.thinkContent += thinkContent;
                   info.content += content;
                 } else {
-                  // 如果没有 <think> 标签，直接将消息内容赋值到 content
-                  info.content += parsedData.message;
+                  var startRegex = /<think>([\s\S]*)/;
+                  var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
+                  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;
+                      var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
+                      var _content = end[2] ? end[2].trim() : '';
+                      // 更新 AI 消息内容
+                      info.thinkContent += _thinkContent2;
+                      info.content += _content;
+                      chunks += _content;
+                    } else if (finishThink) {
+                      info.content += parsedData.message;
+                      chunks += parsedData.message;
+                    } else {
+                      info.thinkContent += parsedData.message;
+                    }
+                  }
                 }
+                primeval += parsedData.message;
                 done = parsedData.done;
               } catch (parseError) {
                 console.error('解析数据出错:', parseError);
               }
-              // Promise.resolve({message: info, controller});
             }
           } else {
             // 保存未处理完的部分数据
             remainingData += line + '\n';
           }
         });
+        info.primeval = primeval;
+        info.chunk = chunks;
 
         // 将未完整处理的数据保留到 partialData 中
         partialData = remainingData;
@@ -3950,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
@@ -4000,7 +4042,7 @@ var render = function () {
                           ),
                         ]
                       )
-                    : item.type === "date"
+                    : item.type === "dateTime"
                     ? _c("div", { staticClass: "es-handler-date" }, [
                         _c("div", [
                           _vm._v(
@@ -4041,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",
                           },
@@ -4055,7 +4097,7 @@ var render = function () {
                           },
                         },
                         [
-                          _vm.system.length
+                          _vm.systemData.length
                             ? _c(
                                 "el-scrollbar",
                                 { attrs: { "max-height": _vm.maxHeight } },
@@ -4063,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",
                                         {
@@ -4154,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,
                           },
                         },
                         [
@@ -4198,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);
@@ -4209,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;
+
 //
 //
 //
@@ -4335,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,
@@ -4350,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: {
@@ -4373,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) {
@@ -4387,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() {
@@ -4505,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: '确定',
@@ -4515,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');
@@ -4554,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) {});