eoss-ui 0.6.52 → 0.6.53

package/lib/utils/util.js

@@ -509,61 +509,64 @@ var ajaxStream = function ajaxStream(_ref2) {
           if (line === '') {
             return;
           }
-          if (line.startsWith('data:')) {
-            var _data = line.replace('data:', '').trim();
-            if (_data) {
-              try {
-                // 假设数据是 JSON 格式
-                var parsedData = JSON.parse(_data);
-                info.time = parsedData.time;
-                info.conversationId = parsedData.conversationId;
-                var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
-                var match = parsedData.message.match(thinkRegex);
-                if (match) {
-                  var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
-                  var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
-                  // 更新 AI 消息内容
-                  info.thinkContent += thinkContent;
-                  info.content += content;
+          // if (line.startsWith('data:')) {
+          var data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
+          if (data) {
+            try {
+              // 假设数据是 JSON 格式
+              var parsedData = JSON.parse(data);
+              info.time = parsedData.time;
+              info.conversationId = parsedData.conversationId;
+              var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
+              var match = parsedData.message.match(thinkRegex);
+              if (match) {
+                var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
+                var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
+                // 更新 AI 消息内容
+                info.thinkContent += thinkContent;
+                info.content += content;
+              } else {
+                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 {
-                  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) {
+                  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 {
-                    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;
-                    }
+                    info.thinkContent += parsedData.message;
                   }
                 }
-                primeval += parsedData.message;
-                done = parsedData.done;
-              } catch (parseError) {
-                console.error('解析数据出错:', parseError);
               }
+              primeval += parsedData.message;
+              done = parsedData.done;
+            } catch (parseError) {
+              remainingData += line;
+              console.log('解析数据出错:', parseError);
             }
-          } else {
-            // 保存未处理完的部分数据
-            remainingData += line + '\n';
           }
+          // }
+          // else {
+          //   console.log('未处理的数据:', line);
+          //   // 保存未处理完的部分数据
+          //   remainingData += line.replace('data:', '\ndata:');
+          // }
         });
         info.primeval = primeval;
         info.chunk = chunks;
@@ -572,7 +575,7 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData = remainingData;
         progress && progress({ message: info, controller: controller, done: done });
       }
-    })).then(function () {
+    })).then(function (results) {
       // 处理请求完成后的信息
       var originalText = info.content;
       var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -581,8 +584,8 @@ var ajaxStream = function ajaxStream(_ref2) {
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      success && success({ message: info, controller: controller });
-    }).catch(function () {
+      success && success({ message: info, controller: controller, results: results });
+    }).catch(function (results) {
       // 处理请求完成后的信息
       var originalText = info.content || '';
       var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -591,7 +594,7 @@ var ajaxStream = function ajaxStream(_ref2) {
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      fail && fail({ status: 1, message: info, controller: controller });
+      fail && fail({ status: 1, message: info, controller: controller, results: results });
     });
   } catch (error) {
     console.error('聊天请求出错:', error);
@@ -688,7 +691,7 @@ var busEmit = function busEmit(that, _ref3) {
 
   var bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
   if (bus) {
-    bus.$emit(method, args);
+    Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
   } else {
     win.parent.postMessage({ method: method, query: args }, '*');
   }

package/lib/wujie.js

@@ -115,8 +115,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(10).sm2;
-var lodash = __webpack_require__(11);
+var sm2 = __webpack_require__(11).sm2;
+var lodash = __webpack_require__(10);
 
 
 
@@ -592,61 +592,64 @@ var ajaxStream = function ajaxStream(_ref2) {
           if (line === '') {
             return;
           }
-          if (line.startsWith('data:')) {
-            var _data = line.replace('data:', '').trim();
-            if (_data) {
-              try {
-                // 假设数据是 JSON 格式
-                var parsedData = JSON.parse(_data);
-                info.time = parsedData.time;
-                info.conversationId = parsedData.conversationId;
-                var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
-                var match = parsedData.message.match(thinkRegex);
-                if (match) {
-                  var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
-                  var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
-                  // 更新 AI 消息内容
-                  info.thinkContent += thinkContent;
-                  info.content += content;
+          // if (line.startsWith('data:')) {
+          var data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
+          if (data) {
+            try {
+              // 假设数据是 JSON 格式
+              var parsedData = JSON.parse(data);
+              info.time = parsedData.time;
+              info.conversationId = parsedData.conversationId;
+              var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
+              var match = parsedData.message.match(thinkRegex);
+              if (match) {
+                var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
+                var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
+                // 更新 AI 消息内容
+                info.thinkContent += thinkContent;
+                info.content += content;
+              } else {
+                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 {
-                  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) {
+                  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 {
-                    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;
-                    }
+                    info.thinkContent += parsedData.message;
                   }
                 }
-                primeval += parsedData.message;
-                done = parsedData.done;
-              } catch (parseError) {
-                console.error('解析数据出错:', parseError);
               }
+              primeval += parsedData.message;
+              done = parsedData.done;
+            } catch (parseError) {
+              remainingData += line;
+              console.log('解析数据出错:', parseError);
             }
-          } else {
-            // 保存未处理完的部分数据
-            remainingData += line + '\n';
           }
+          // }
+          // else {
+          //   console.log('未处理的数据:', line);
+          //   // 保存未处理完的部分数据
+          //   remainingData += line.replace('data:', '\ndata:');
+          // }
         });
         info.primeval = primeval;
         info.chunk = chunks;
@@ -655,7 +658,7 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData = remainingData;
         progress && progress({ message: info, controller: controller, done: done });
       }
-    })).then(function () {
+    })).then(function (results) {
       // 处理请求完成后的信息
       var originalText = info.content;
       var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -664,8 +667,8 @@ var ajaxStream = function ajaxStream(_ref2) {
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      success && success({ message: info, controller: controller });
-    }).catch(function () {
+      success && success({ message: info, controller: controller, results: results });
+    }).catch(function (results) {
       // 处理请求完成后的信息
       var originalText = info.content || '';
       var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -674,7 +677,7 @@ var ajaxStream = function ajaxStream(_ref2) {
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      fail && fail({ status: 1, message: info, controller: controller });
+      fail && fail({ status: 1, message: info, controller: controller, results: results });
     });
   } catch (error) {
     console.error('聊天请求出错:', error);
@@ -771,7 +774,7 @@ var busEmit = function busEmit(that, _ref3) {
 
   var bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
   if (bus) {
-    bus.$emit(method, args);
+    Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
   } else {
     win.parent.postMessage({ method: method, query: args }, '*');
   }
@@ -3876,14 +3879,14 @@ var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
 /***/ 10:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 
 /***/ 11:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 

package/lib/wxlogin.js

@@ -115,8 +115,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(10).sm2;
-var lodash = __webpack_require__(11);
+var sm2 = __webpack_require__(11).sm2;
+var lodash = __webpack_require__(10);
 
 
 
@@ -592,61 +592,64 @@ var ajaxStream = function ajaxStream(_ref2) {
           if (line === '') {
             return;
           }
-          if (line.startsWith('data:')) {
-            var _data = line.replace('data:', '').trim();
-            if (_data) {
-              try {
-                // 假设数据是 JSON 格式
-                var parsedData = JSON.parse(_data);
-                info.time = parsedData.time;
-                info.conversationId = parsedData.conversationId;
-                var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
-                var match = parsedData.message.match(thinkRegex);
-                if (match) {
-                  var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
-                  var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
-                  // 更新 AI 消息内容
-                  info.thinkContent += thinkContent;
-                  info.content += content;
+          // if (line.startsWith('data:')) {
+          var data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
+          if (data) {
+            try {
+              // 假设数据是 JSON 格式
+              var parsedData = JSON.parse(data);
+              info.time = parsedData.time;
+              info.conversationId = parsedData.conversationId;
+              var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
+              var match = parsedData.message.match(thinkRegex);
+              if (match) {
+                var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
+                var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
+                // 更新 AI 消息内容
+                info.thinkContent += thinkContent;
+                info.content += content;
+              } else {
+                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 {
-                  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) {
+                  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 {
-                    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;
-                    }
+                    info.thinkContent += parsedData.message;
                   }
                 }
-                primeval += parsedData.message;
-                done = parsedData.done;
-              } catch (parseError) {
-                console.error('解析数据出错:', parseError);
               }
+              primeval += parsedData.message;
+              done = parsedData.done;
+            } catch (parseError) {
+              remainingData += line;
+              console.log('解析数据出错:', parseError);
             }
-          } else {
-            // 保存未处理完的部分数据
-            remainingData += line + '\n';
           }
+          // }
+          // else {
+          //   console.log('未处理的数据:', line);
+          //   // 保存未处理完的部分数据
+          //   remainingData += line.replace('data:', '\ndata:');
+          // }
         });
         info.primeval = primeval;
         info.chunk = chunks;
@@ -655,7 +658,7 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData = remainingData;
         progress && progress({ message: info, controller: controller, done: done });
       }
-    })).then(function () {
+    })).then(function (results) {
       // 处理请求完成后的信息
       var originalText = info.content;
       var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -664,8 +667,8 @@ var ajaxStream = function ajaxStream(_ref2) {
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      success && success({ message: info, controller: controller });
-    }).catch(function () {
+      success && success({ message: info, controller: controller, results: results });
+    }).catch(function (results) {
       // 处理请求完成后的信息
       var originalText = info.content || '';
       var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -674,7 +677,7 @@ var ajaxStream = function ajaxStream(_ref2) {
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      fail && fail({ status: 1, message: info, controller: controller });
+      fail && fail({ status: 1, message: info, controller: controller, results: results });
     });
   } catch (error) {
     console.error('聊天请求出错:', error);
@@ -771,7 +774,7 @@ var busEmit = function busEmit(that, _ref3) {
 
   var bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
   if (bus) {
-    bus.$emit(method, args);
+    Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
   } else {
     win.parent.postMessage({ method: method, query: args }, '*');
   }
@@ -3876,14 +3879,14 @@ var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
 /***/ 10:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 
 /***/ 11:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),