eoss-ui 0.6.51 → 0.6.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/button-group.js +58 -55
- package/lib/button.js +58 -55
- package/lib/checkbox-group.js +61 -58
- package/lib/data-table-form.js +58 -55
- package/lib/data-table.js +65 -62
- package/lib/date-picker.js +58 -55
- package/lib/dialog.js +58 -55
- package/lib/eoss-ui.common.js +422 -335
- package/lib/flow-group.js +58 -55
- package/lib/flow-list.js +87 -61
- package/lib/flow.js +187 -144
- package/lib/form.js +62 -59
- package/lib/handle-user.js +58 -55
- package/lib/handler.js +58 -55
- package/lib/icon.js +58 -55
- package/lib/index.js +1 -1
- package/lib/input-number.js +58 -55
- package/lib/input.js +59 -56
- package/lib/login.js +61 -58
- package/lib/main.js +126 -103
- package/lib/menu.js +1 -1
- package/lib/nav.js +61 -58
- package/lib/page.js +58 -55
- package/lib/pagination.js +58 -55
- package/lib/player.js +58 -55
- package/lib/qr-code.js +58 -55
- package/lib/radio-group.js +61 -58
- package/lib/retrial-auth.js +58 -55
- package/lib/select-ganged.js +59 -56
- package/lib/select.js +61 -57
- package/lib/selector-panel.js +61 -58
- package/lib/selector.js +58 -55
- package/lib/sizer.js +58 -55
- package/lib/steps.js +61 -58
- package/lib/switch.js +58 -55
- package/lib/table-form.js +58 -55
- package/lib/tabs.js +58 -55
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/upload.css +1 -1
- package/lib/tips.js +61 -58
- package/lib/tree-group.js +58 -55
- package/lib/tree.js +61 -58
- package/lib/upload.js +72 -69
- package/lib/utils/util.js +54 -51
- package/lib/wujie.js +58 -55
- package/lib/wxlogin.js +58 -55
- package/package.json +2 -2
- package/packages/checkbox-group/src/main.vue +2 -2
- package/packages/data-table/src/main.vue +3 -3
- package/packages/flow/src/reset.vue +4 -6
- package/packages/flow/src/startTaskRead.vue +180 -136
- package/packages/flow-list/src/main.vue +25 -2
- package/packages/form/src/main.vue +3 -3
- package/packages/input/src/main.vue +2 -2
- package/packages/login/src/main.vue +2 -2
- package/packages/main/src/default/index.vue +7 -1
- package/packages/main/src/main.vue +4 -1
- package/packages/main/src/public/search.vue +8 -3
- package/packages/main/src/simplicity/apps.vue +2 -2
- package/packages/main/src/simplicity/index.vue +3 -3
- package/packages/main/src/simplicity/user.vue +2 -2
- package/packages/menu/src/main.vue +2 -2
- package/packages/nav/src/main.vue +2 -2
- package/packages/radio-group/src/main.vue +2 -2
- package/packages/select/src/main.vue +4 -3
- package/packages/select-ganged/src/main.vue +2 -2
- package/packages/selector-panel/src/main.vue +2 -2
- package/packages/steps/src/main.vue +2 -2
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/upload.css +1 -1
- package/packages/theme-chalk/src/upload.scss +1 -0
- package/packages/tips/src/main.vue +2 -2
- package/packages/tree/src/main.vue +2 -2
- package/packages/upload/src/main.vue +18 -10
- package/src/index.js +1 -1
- package/src/utils/util.js +15 -12
package/lib/input-number.js
CHANGED
|
@@ -115,8 +115,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
|
|
|
115
115
|
**/
|
|
116
116
|
|
|
117
117
|
/* eslint-disable indent */
|
|
118
|
-
var sm2 = __webpack_require__(
|
|
119
|
-
var lodash = __webpack_require__(
|
|
118
|
+
var sm2 = __webpack_require__(11).sm2;
|
|
119
|
+
var lodash = __webpack_require__(10);
|
|
120
120
|
|
|
121
121
|
|
|
122
122
|
|
|
@@ -592,61 +592,64 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
592
592
|
if (line === '') {
|
|
593
593
|
return;
|
|
594
594
|
}
|
|
595
|
-
if (line.startsWith('data:')) {
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
595
|
+
// if (line.startsWith('data:')) {
|
|
596
|
+
var data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
|
|
597
|
+
if (data) {
|
|
598
|
+
try {
|
|
599
|
+
// 假设数据是 JSON 格式
|
|
600
|
+
var parsedData = JSON.parse(data);
|
|
601
|
+
info.time = parsedData.time;
|
|
602
|
+
info.conversationId = parsedData.conversationId;
|
|
603
|
+
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
604
|
+
var match = parsedData.message.match(thinkRegex);
|
|
605
|
+
if (match) {
|
|
606
|
+
var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
|
|
607
|
+
var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
|
|
608
|
+
// 更新 AI 消息内容
|
|
609
|
+
info.thinkContent += thinkContent;
|
|
610
|
+
info.content += content;
|
|
611
|
+
} else {
|
|
612
|
+
var startRegex = /<think>([\s\S]*)/;
|
|
613
|
+
var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
614
|
+
var start = parsedData.message.match(startRegex);
|
|
615
|
+
var end = parsedData.message.match(endRegex);
|
|
616
|
+
if (start) {
|
|
617
|
+
hasThink = true;
|
|
618
|
+
var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
|
|
619
|
+
info.thinkContent += _thinkContent;
|
|
620
|
+
} else if (hasThink === false) {
|
|
621
|
+
info.content += parsedData.message;
|
|
622
|
+
chunks += parsedData.message;
|
|
611
623
|
} else {
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
} else if (
|
|
624
|
+
if (end) {
|
|
625
|
+
finishThink = true;
|
|
626
|
+
var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
|
|
627
|
+
var _content = end[2] ? end[2].trim() : '';
|
|
628
|
+
// 更新 AI 消息内容
|
|
629
|
+
info.thinkContent += _thinkContent2;
|
|
630
|
+
info.content += _content;
|
|
631
|
+
chunks += _content;
|
|
632
|
+
} else if (finishThink) {
|
|
621
633
|
info.content += parsedData.message;
|
|
622
634
|
chunks += parsedData.message;
|
|
623
635
|
} else {
|
|
624
|
-
|
|
625
|
-
finishThink = true;
|
|
626
|
-
var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
|
|
627
|
-
var _content = end[2] ? end[2].trim() : '';
|
|
628
|
-
// 更新 AI 消息内容
|
|
629
|
-
info.thinkContent += _thinkContent2;
|
|
630
|
-
info.content += _content;
|
|
631
|
-
chunks += _content;
|
|
632
|
-
} else if (finishThink) {
|
|
633
|
-
info.content += parsedData.message;
|
|
634
|
-
chunks += parsedData.message;
|
|
635
|
-
} else {
|
|
636
|
-
info.thinkContent += parsedData.message;
|
|
637
|
-
}
|
|
636
|
+
info.thinkContent += parsedData.message;
|
|
638
637
|
}
|
|
639
638
|
}
|
|
640
|
-
primeval += parsedData.message;
|
|
641
|
-
done = parsedData.done;
|
|
642
|
-
} catch (parseError) {
|
|
643
|
-
console.error('解析数据出错:', parseError);
|
|
644
639
|
}
|
|
640
|
+
primeval += parsedData.message;
|
|
641
|
+
done = parsedData.done;
|
|
642
|
+
} catch (parseError) {
|
|
643
|
+
remainingData += line;
|
|
644
|
+
console.log('解析数据出错:', parseError);
|
|
645
645
|
}
|
|
646
|
-
} else {
|
|
647
|
-
// 保存未处理完的部分数据
|
|
648
|
-
remainingData += line + '\n';
|
|
649
646
|
}
|
|
647
|
+
// }
|
|
648
|
+
// else {
|
|
649
|
+
// console.log('未处理的数据:', line);
|
|
650
|
+
// // 保存未处理完的部分数据
|
|
651
|
+
// remainingData += line.replace('data:', '\ndata:');
|
|
652
|
+
// }
|
|
650
653
|
});
|
|
651
654
|
info.primeval = primeval;
|
|
652
655
|
info.chunk = chunks;
|
|
@@ -655,7 +658,7 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
655
658
|
partialData = remainingData;
|
|
656
659
|
progress && progress({ message: info, controller: controller, done: done });
|
|
657
660
|
}
|
|
658
|
-
})).then(function () {
|
|
661
|
+
})).then(function (results) {
|
|
659
662
|
// 处理请求完成后的信息
|
|
660
663
|
var originalText = info.content;
|
|
661
664
|
var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
|
|
@@ -664,8 +667,8 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
664
667
|
info.thinkContent = match ? match[1].trim() : '';
|
|
665
668
|
info.content = match ? match[2].trim() : '';
|
|
666
669
|
}
|
|
667
|
-
success && success({ message: info, controller: controller });
|
|
668
|
-
}).catch(function () {
|
|
670
|
+
success && success({ message: info, controller: controller, results: results });
|
|
671
|
+
}).catch(function (results) {
|
|
669
672
|
// 处理请求完成后的信息
|
|
670
673
|
var originalText = info.content || '';
|
|
671
674
|
var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
|
|
@@ -674,7 +677,7 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
674
677
|
info.thinkContent = match ? match[1].trim() : '';
|
|
675
678
|
info.content = match ? match[2].trim() : '';
|
|
676
679
|
}
|
|
677
|
-
fail && fail({ status: 1, message: info, controller: controller });
|
|
680
|
+
fail && fail({ status: 1, message: info, controller: controller, results: results });
|
|
678
681
|
});
|
|
679
682
|
} catch (error) {
|
|
680
683
|
console.error('聊天请求出错:', error);
|
|
@@ -771,7 +774,7 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
771
774
|
|
|
772
775
|
var bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
|
|
773
776
|
if (bus) {
|
|
774
|
-
bus.$emit(method, args);
|
|
777
|
+
Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
|
|
775
778
|
} else {
|
|
776
779
|
win.parent.postMessage({ method: method, query: args }, '*');
|
|
777
780
|
}
|
|
@@ -3876,14 +3879,14 @@ var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
|
|
|
3876
3879
|
/***/ 10:
|
|
3877
3880
|
/***/ (function(module, exports) {
|
|
3878
3881
|
|
|
3879
|
-
module.exports = require("
|
|
3882
|
+
module.exports = require("lodash");
|
|
3880
3883
|
|
|
3881
3884
|
/***/ }),
|
|
3882
3885
|
|
|
3883
3886
|
/***/ 11:
|
|
3884
3887
|
/***/ (function(module, exports) {
|
|
3885
3888
|
|
|
3886
|
-
module.exports = require("
|
|
3889
|
+
module.exports = require("sm-crypto");
|
|
3887
3890
|
|
|
3888
3891
|
/***/ }),
|
|
3889
3892
|
|
package/lib/input.js
CHANGED
|
@@ -115,8 +115,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
|
|
|
115
115
|
**/
|
|
116
116
|
|
|
117
117
|
/* eslint-disable indent */
|
|
118
|
-
var sm2 = __webpack_require__(
|
|
119
|
-
var lodash = __webpack_require__(
|
|
118
|
+
var sm2 = __webpack_require__(11).sm2;
|
|
119
|
+
var lodash = __webpack_require__(10);
|
|
120
120
|
|
|
121
121
|
|
|
122
122
|
|
|
@@ -592,61 +592,64 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
592
592
|
if (line === '') {
|
|
593
593
|
return;
|
|
594
594
|
}
|
|
595
|
-
if (line.startsWith('data:')) {
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
595
|
+
// if (line.startsWith('data:')) {
|
|
596
|
+
var data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
|
|
597
|
+
if (data) {
|
|
598
|
+
try {
|
|
599
|
+
// 假设数据是 JSON 格式
|
|
600
|
+
var parsedData = JSON.parse(data);
|
|
601
|
+
info.time = parsedData.time;
|
|
602
|
+
info.conversationId = parsedData.conversationId;
|
|
603
|
+
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
604
|
+
var match = parsedData.message.match(thinkRegex);
|
|
605
|
+
if (match) {
|
|
606
|
+
var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
|
|
607
|
+
var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
|
|
608
|
+
// 更新 AI 消息内容
|
|
609
|
+
info.thinkContent += thinkContent;
|
|
610
|
+
info.content += content;
|
|
611
|
+
} else {
|
|
612
|
+
var startRegex = /<think>([\s\S]*)/;
|
|
613
|
+
var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
614
|
+
var start = parsedData.message.match(startRegex);
|
|
615
|
+
var end = parsedData.message.match(endRegex);
|
|
616
|
+
if (start) {
|
|
617
|
+
hasThink = true;
|
|
618
|
+
var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
|
|
619
|
+
info.thinkContent += _thinkContent;
|
|
620
|
+
} else if (hasThink === false) {
|
|
621
|
+
info.content += parsedData.message;
|
|
622
|
+
chunks += parsedData.message;
|
|
611
623
|
} else {
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
} else if (
|
|
624
|
+
if (end) {
|
|
625
|
+
finishThink = true;
|
|
626
|
+
var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
|
|
627
|
+
var _content = end[2] ? end[2].trim() : '';
|
|
628
|
+
// 更新 AI 消息内容
|
|
629
|
+
info.thinkContent += _thinkContent2;
|
|
630
|
+
info.content += _content;
|
|
631
|
+
chunks += _content;
|
|
632
|
+
} else if (finishThink) {
|
|
621
633
|
info.content += parsedData.message;
|
|
622
634
|
chunks += parsedData.message;
|
|
623
635
|
} else {
|
|
624
|
-
|
|
625
|
-
finishThink = true;
|
|
626
|
-
var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
|
|
627
|
-
var _content = end[2] ? end[2].trim() : '';
|
|
628
|
-
// 更新 AI 消息内容
|
|
629
|
-
info.thinkContent += _thinkContent2;
|
|
630
|
-
info.content += _content;
|
|
631
|
-
chunks += _content;
|
|
632
|
-
} else if (finishThink) {
|
|
633
|
-
info.content += parsedData.message;
|
|
634
|
-
chunks += parsedData.message;
|
|
635
|
-
} else {
|
|
636
|
-
info.thinkContent += parsedData.message;
|
|
637
|
-
}
|
|
636
|
+
info.thinkContent += parsedData.message;
|
|
638
637
|
}
|
|
639
638
|
}
|
|
640
|
-
primeval += parsedData.message;
|
|
641
|
-
done = parsedData.done;
|
|
642
|
-
} catch (parseError) {
|
|
643
|
-
console.error('解析数据出错:', parseError);
|
|
644
639
|
}
|
|
640
|
+
primeval += parsedData.message;
|
|
641
|
+
done = parsedData.done;
|
|
642
|
+
} catch (parseError) {
|
|
643
|
+
remainingData += line;
|
|
644
|
+
console.log('解析数据出错:', parseError);
|
|
645
645
|
}
|
|
646
|
-
} else {
|
|
647
|
-
// 保存未处理完的部分数据
|
|
648
|
-
remainingData += line + '\n';
|
|
649
646
|
}
|
|
647
|
+
// }
|
|
648
|
+
// else {
|
|
649
|
+
// console.log('未处理的数据:', line);
|
|
650
|
+
// // 保存未处理完的部分数据
|
|
651
|
+
// remainingData += line.replace('data:', '\ndata:');
|
|
652
|
+
// }
|
|
650
653
|
});
|
|
651
654
|
info.primeval = primeval;
|
|
652
655
|
info.chunk = chunks;
|
|
@@ -655,7 +658,7 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
655
658
|
partialData = remainingData;
|
|
656
659
|
progress && progress({ message: info, controller: controller, done: done });
|
|
657
660
|
}
|
|
658
|
-
})).then(function () {
|
|
661
|
+
})).then(function (results) {
|
|
659
662
|
// 处理请求完成后的信息
|
|
660
663
|
var originalText = info.content;
|
|
661
664
|
var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
|
|
@@ -664,8 +667,8 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
664
667
|
info.thinkContent = match ? match[1].trim() : '';
|
|
665
668
|
info.content = match ? match[2].trim() : '';
|
|
666
669
|
}
|
|
667
|
-
success && success({ message: info, controller: controller });
|
|
668
|
-
}).catch(function () {
|
|
670
|
+
success && success({ message: info, controller: controller, results: results });
|
|
671
|
+
}).catch(function (results) {
|
|
669
672
|
// 处理请求完成后的信息
|
|
670
673
|
var originalText = info.content || '';
|
|
671
674
|
var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
|
|
@@ -674,7 +677,7 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
674
677
|
info.thinkContent = match ? match[1].trim() : '';
|
|
675
678
|
info.content = match ? match[2].trim() : '';
|
|
676
679
|
}
|
|
677
|
-
fail && fail({ status: 1, message: info, controller: controller });
|
|
680
|
+
fail && fail({ status: 1, message: info, controller: controller, results: results });
|
|
678
681
|
});
|
|
679
682
|
} catch (error) {
|
|
680
683
|
console.error('聊天请求出错:', error);
|
|
@@ -771,7 +774,7 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
771
774
|
|
|
772
775
|
var bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
|
|
773
776
|
if (bus) {
|
|
774
|
-
bus.$emit(method, args);
|
|
777
|
+
Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
|
|
775
778
|
} else {
|
|
776
779
|
win.parent.postMessage({ method: method, query: args }, '*');
|
|
777
780
|
}
|
|
@@ -3876,14 +3879,14 @@ var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
|
|
|
3876
3879
|
/***/ 10:
|
|
3877
3880
|
/***/ (function(module, exports) {
|
|
3878
3881
|
|
|
3879
|
-
module.exports = require("
|
|
3882
|
+
module.exports = require("lodash");
|
|
3880
3883
|
|
|
3881
3884
|
/***/ }),
|
|
3882
3885
|
|
|
3883
3886
|
/***/ 11:
|
|
3884
3887
|
/***/ (function(module, exports) {
|
|
3885
3888
|
|
|
3886
|
-
module.exports = require("
|
|
3889
|
+
module.exports = require("sm-crypto");
|
|
3887
3890
|
|
|
3888
3891
|
/***/ }),
|
|
3889
3892
|
|
|
@@ -4338,7 +4341,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
|
|
|
4338
4341
|
beforeCreate: function beforeCreate() {
|
|
4339
4342
|
var _this2 = this;
|
|
4340
4343
|
|
|
4341
|
-
this.getData = Object(external_throttle_debounce_["
|
|
4344
|
+
this.getData = Object(external_throttle_debounce_["throttle"])(500, function (query, callback, isChange) {
|
|
4342
4345
|
_this2.getDatas(query, callback, isChange);
|
|
4343
4346
|
});
|
|
4344
4347
|
},
|
package/lib/login.js
CHANGED
|
@@ -114,8 +114,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
|
|
|
114
114
|
**/
|
|
115
115
|
|
|
116
116
|
/* eslint-disable indent */
|
|
117
|
-
var sm2 = __webpack_require__(
|
|
118
|
-
var lodash = __webpack_require__(
|
|
117
|
+
var sm2 = __webpack_require__(11).sm2;
|
|
118
|
+
var lodash = __webpack_require__(10);
|
|
119
119
|
|
|
120
120
|
|
|
121
121
|
|
|
@@ -591,61 +591,64 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
591
591
|
if (line === '') {
|
|
592
592
|
return;
|
|
593
593
|
}
|
|
594
|
-
if (line.startsWith('data:')) {
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
594
|
+
// if (line.startsWith('data:')) {
|
|
595
|
+
var data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
|
|
596
|
+
if (data) {
|
|
597
|
+
try {
|
|
598
|
+
// 假设数据是 JSON 格式
|
|
599
|
+
var parsedData = JSON.parse(data);
|
|
600
|
+
info.time = parsedData.time;
|
|
601
|
+
info.conversationId = parsedData.conversationId;
|
|
602
|
+
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
603
|
+
var match = parsedData.message.match(thinkRegex);
|
|
604
|
+
if (match) {
|
|
605
|
+
var thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
|
|
606
|
+
var content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
|
|
607
|
+
// 更新 AI 消息内容
|
|
608
|
+
info.thinkContent += thinkContent;
|
|
609
|
+
info.content += content;
|
|
610
|
+
} else {
|
|
611
|
+
var startRegex = /<think>([\s\S]*)/;
|
|
612
|
+
var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
613
|
+
var start = parsedData.message.match(startRegex);
|
|
614
|
+
var end = parsedData.message.match(endRegex);
|
|
615
|
+
if (start) {
|
|
616
|
+
hasThink = true;
|
|
617
|
+
var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
|
|
618
|
+
info.thinkContent += _thinkContent;
|
|
619
|
+
} else if (hasThink === false) {
|
|
620
|
+
info.content += parsedData.message;
|
|
621
|
+
chunks += parsedData.message;
|
|
610
622
|
} else {
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
} else if (
|
|
623
|
+
if (end) {
|
|
624
|
+
finishThink = true;
|
|
625
|
+
var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
|
|
626
|
+
var _content = end[2] ? end[2].trim() : '';
|
|
627
|
+
// 更新 AI 消息内容
|
|
628
|
+
info.thinkContent += _thinkContent2;
|
|
629
|
+
info.content += _content;
|
|
630
|
+
chunks += _content;
|
|
631
|
+
} else if (finishThink) {
|
|
620
632
|
info.content += parsedData.message;
|
|
621
633
|
chunks += parsedData.message;
|
|
622
634
|
} else {
|
|
623
|
-
|
|
624
|
-
finishThink = true;
|
|
625
|
-
var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
|
|
626
|
-
var _content = end[2] ? end[2].trim() : '';
|
|
627
|
-
// 更新 AI 消息内容
|
|
628
|
-
info.thinkContent += _thinkContent2;
|
|
629
|
-
info.content += _content;
|
|
630
|
-
chunks += _content;
|
|
631
|
-
} else if (finishThink) {
|
|
632
|
-
info.content += parsedData.message;
|
|
633
|
-
chunks += parsedData.message;
|
|
634
|
-
} else {
|
|
635
|
-
info.thinkContent += parsedData.message;
|
|
636
|
-
}
|
|
635
|
+
info.thinkContent += parsedData.message;
|
|
637
636
|
}
|
|
638
637
|
}
|
|
639
|
-
primeval += parsedData.message;
|
|
640
|
-
done = parsedData.done;
|
|
641
|
-
} catch (parseError) {
|
|
642
|
-
console.error('解析数据出错:', parseError);
|
|
643
638
|
}
|
|
639
|
+
primeval += parsedData.message;
|
|
640
|
+
done = parsedData.done;
|
|
641
|
+
} catch (parseError) {
|
|
642
|
+
remainingData += line;
|
|
643
|
+
console.log('解析数据出错:', parseError);
|
|
644
644
|
}
|
|
645
|
-
} else {
|
|
646
|
-
// 保存未处理完的部分数据
|
|
647
|
-
remainingData += line + '\n';
|
|
648
645
|
}
|
|
646
|
+
// }
|
|
647
|
+
// else {
|
|
648
|
+
// console.log('未处理的数据:', line);
|
|
649
|
+
// // 保存未处理完的部分数据
|
|
650
|
+
// remainingData += line.replace('data:', '\ndata:');
|
|
651
|
+
// }
|
|
649
652
|
});
|
|
650
653
|
info.primeval = primeval;
|
|
651
654
|
info.chunk = chunks;
|
|
@@ -654,7 +657,7 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
654
657
|
partialData = remainingData;
|
|
655
658
|
progress && progress({ message: info, controller: controller, done: done });
|
|
656
659
|
}
|
|
657
|
-
})).then(function () {
|
|
660
|
+
})).then(function (results) {
|
|
658
661
|
// 处理请求完成后的信息
|
|
659
662
|
var originalText = info.content;
|
|
660
663
|
var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
|
|
@@ -663,8 +666,8 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
663
666
|
info.thinkContent = match ? match[1].trim() : '';
|
|
664
667
|
info.content = match ? match[2].trim() : '';
|
|
665
668
|
}
|
|
666
|
-
success && success({ message: info, controller: controller });
|
|
667
|
-
}).catch(function () {
|
|
669
|
+
success && success({ message: info, controller: controller, results: results });
|
|
670
|
+
}).catch(function (results) {
|
|
668
671
|
// 处理请求完成后的信息
|
|
669
672
|
var originalText = info.content || '';
|
|
670
673
|
var regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
|
|
@@ -673,7 +676,7 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
673
676
|
info.thinkContent = match ? match[1].trim() : '';
|
|
674
677
|
info.content = match ? match[2].trim() : '';
|
|
675
678
|
}
|
|
676
|
-
fail && fail({ status: 1, message: info, controller: controller });
|
|
679
|
+
fail && fail({ status: 1, message: info, controller: controller, results: results });
|
|
677
680
|
});
|
|
678
681
|
} catch (error) {
|
|
679
682
|
console.error('聊天请求出错:', error);
|
|
@@ -770,7 +773,7 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
770
773
|
|
|
771
774
|
var bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
|
|
772
775
|
if (bus) {
|
|
773
|
-
bus.$emit(method, args);
|
|
776
|
+
Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
|
|
774
777
|
} else {
|
|
775
778
|
win.parent.postMessage({ method: method, query: args }, '*');
|
|
776
779
|
}
|
|
@@ -4155,13 +4158,13 @@ module.exports = require("stompjs");
|
|
|
4155
4158
|
/* 10 */
|
|
4156
4159
|
/***/ (function(module, exports) {
|
|
4157
4160
|
|
|
4158
|
-
module.exports = require("
|
|
4161
|
+
module.exports = require("lodash");
|
|
4159
4162
|
|
|
4160
4163
|
/***/ }),
|
|
4161
4164
|
/* 11 */
|
|
4162
4165
|
/***/ (function(module, exports) {
|
|
4163
4166
|
|
|
4164
|
-
module.exports = require("
|
|
4167
|
+
module.exports = require("sm-crypto");
|
|
4165
4168
|
|
|
4166
4169
|
/***/ }),
|
|
4167
4170
|
/* 12 */
|
|
@@ -4261,7 +4264,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
|
|
|
4261
4264
|
// ESM COMPAT FLAG
|
|
4262
4265
|
__webpack_require__.r(__webpack_exports__);
|
|
4263
4266
|
|
|
4264
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=
|
|
4267
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=280eaf9f&
|
|
4265
4268
|
var render = function () {
|
|
4266
4269
|
var _vm = this
|
|
4267
4270
|
var _h = _vm.$createElement
|
|
@@ -5451,7 +5454,7 @@ var staticRenderFns = [
|
|
|
5451
5454
|
render._withStripped = true
|
|
5452
5455
|
|
|
5453
5456
|
|
|
5454
|
-
// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=
|
|
5457
|
+
// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=280eaf9f&
|
|
5455
5458
|
|
|
5456
5459
|
// EXTERNAL MODULE: external "babel-runtime/regenerator"
|
|
5457
5460
|
var regenerator_ = __webpack_require__(14);
|
|
@@ -7010,7 +7013,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
|
|
|
7010
7013
|
};
|
|
7011
7014
|
},
|
|
7012
7015
|
beforeCreate: function beforeCreate() {
|
|
7013
|
-
this.setScale = Object(external_throttle_debounce_["
|
|
7016
|
+
this.setScale = Object(external_throttle_debounce_["throttle"])(300, function () {
|
|
7014
7017
|
util["a" /* default */].setScale();
|
|
7015
7018
|
});
|
|
7016
7019
|
util["a" /* default */].removeStorage(['remind', 'ssId', 'token', 'Authorization', 'deviceUnique', 'userId', 'userName', 'useCaseCodes']);
|