eoss-ui 0.6.39 → 0.6.41
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 +48 -6
- package/lib/button.js +48 -6
- package/lib/checkbox-group.js +48 -6
- package/lib/data-table-form.js +48 -6
- package/lib/data-table.js +67 -22
- package/lib/date-picker.js +48 -6
- package/lib/dialog.js +48 -6
- package/lib/eoss-ui.common.js +1393 -955
- package/lib/flow-group.js +48 -6
- package/lib/flow-list.js +129 -87
- package/lib/flow.js +360 -321
- package/lib/form.js +48 -6
- package/lib/handle-user.js +48 -6
- package/lib/handler.js +195 -82
- package/lib/icon.js +48 -6
- package/lib/icons.js +1 -1
- package/lib/index.js +1 -1
- package/lib/input-number.js +48 -6
- package/lib/input.js +48 -6
- package/lib/login.js +291 -166
- package/lib/main.js +504 -251
- package/lib/nav.js +48 -6
- package/lib/page.js +48 -6
- package/lib/pagination.js +48 -6
- package/lib/player.js +48 -6
- package/lib/qr-code.js +61 -19
- package/lib/radio-group.js +48 -6
- package/lib/retrial-auth.js +48 -6
- package/lib/select-ganged.js +48 -6
- package/lib/select.js +48 -6
- package/lib/selector-panel.js +50 -9
- package/lib/selector.js +85 -11
- package/lib/sizer.js +48 -6
- package/lib/steps.js +48 -6
- package/lib/switch.js +48 -6
- package/lib/table-form.js +48 -6
- package/lib/tabs.js +48 -6
- package/lib/theme-chalk/base.css +1 -1
- package/lib/theme-chalk/fonts/iconfont.ttf +0 -0
- package/lib/theme-chalk/fonts/iconfont.woff +0 -0
- package/lib/theme-chalk/icon.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/login.css +1 -1
- package/lib/theme-chalk/main.css +1 -1
- package/lib/theme-chalk/menu.css +1 -1
- package/lib/theme-chalk/simplicity.css +1 -1
- package/lib/theme-chalk/sizer.css +1 -1
- package/lib/theme-chalk/upload.css +1 -1
- package/lib/tips.js +48 -6
- package/lib/tree-group.js +48 -6
- package/lib/tree.js +48 -6
- package/lib/upload.js +48 -6
- package/lib/utils/util.js +48 -6
- package/lib/wujie.js +48 -6
- package/lib/wxlogin.js +48 -6
- package/package.json +159 -159
- package/packages/.DS_Store +0 -0
- package/packages/button/index.js +5 -5
- package/packages/button/src/main.vue +418 -418
- package/packages/button-group/index.js +5 -5
- package/packages/button-group/src/main.vue +298 -298
- package/packages/calendar/index.js +5 -5
- package/packages/card/index.js +5 -5
- package/packages/card/src/main.vue +156 -156
- package/packages/cascader/index.js +5 -5
- package/packages/cascader/src/main.vue +168 -168
- package/packages/checkbox-group/index.js +5 -5
- package/packages/checkbox-group/src/main.vue +333 -333
- package/packages/clients/index.js +5 -5
- package/packages/clients/src/main.vue +144 -144
- package/packages/data-table/.DS_Store +0 -0
- package/packages/data-table/index.js +5 -5
- package/packages/data-table/src/children.vue +39 -39
- package/packages/data-table/src/column.vue +989 -983
- package/packages/data-table/src/main.vue +1822 -1820
- package/packages/data-table/src/sizer.vue +195 -195
- package/packages/data-table-form/.DS_Store +0 -0
- package/packages/data-table-form/index.js +5 -5
- package/packages/data-table-form/src/checkbox.vue +101 -101
- package/packages/data-table-form/src/colgroup.vue +17 -17
- package/packages/data-table-form/src/main.vue +181 -181
- package/packages/data-table-form/src/radio.vue +65 -65
- package/packages/data-table-form/src/table.vue +233 -233
- package/packages/data-table-form/src/tbody.vue +336 -336
- package/packages/data-table-form/src/thead.vue +68 -68
- package/packages/date-picker/index.js +5 -5
- package/packages/date-picker/src/main.vue +236 -236
- package/packages/dialog/index.js +5 -5
- package/packages/enterprise/index.js +5 -5
- package/packages/enterprise/src/main.vue +66 -66
- package/packages/error-page/.DS_Store +0 -0
- package/packages/error-page/index.js +5 -5
- package/packages/error-page/src/main.vue +44 -44
- package/packages/flow/.DS_Store +0 -0
- package/packages/flow/index.js +5 -5
- package/packages/flow/src/component/CommonOpinions.vue +345 -345
- package/packages/flow/src/component/CustomPreset.vue +322 -322
- package/packages/flow/src/component/FileList.vue +99 -99
- package/packages/flow/src/component/Preset.vue +255 -255
- package/packages/flow/src/component/SendMsg.vue +229 -229
- package/packages/flow/src/component/TimeLimit.vue +190 -190
- package/packages/flow/src/component/taskUnionExamine.vue +611 -603
- package/packages/flow/src/form.vue +121 -121
- package/packages/flow/src/freeStartFlow.vue +2843 -2843
- package/packages/flow/src/main.vue +2862 -2864
- package/packages/flow/src/processForm.vue +1018 -1007
- package/packages/flow/src/processReject.vue +293 -293
- package/packages/flow/src/reset.vue +899 -901
- package/packages/flow/src/startTaskRead.vue +596 -596
- package/packages/flow/src/table.vue +58 -58
- package/packages/flow-group/index.js +5 -5
- package/packages/flow-group/src/main.vue +688 -688
- package/packages/flow-list/index.js +5 -5
- package/packages/flow-list/src/main.vue +1172 -1172
- package/packages/form/.DS_Store +0 -0
- package/packages/form/index.js +5 -5
- package/packages/form/src/main.vue +3584 -3584
- package/packages/form/src/table.vue +1420 -1420
- package/packages/handle-user/index.js +5 -5
- package/packages/handle-user/src/main.vue +138 -138
- package/packages/handler/index.js +5 -5
- package/packages/handler/src/main.vue +474 -388
- package/packages/icon/index.js +5 -5
- package/packages/icon/src/main.vue +101 -101
- package/packages/icons/index.js +5 -5
- package/packages/icons/src/icon.json +1 -1
- package/packages/icons/src/main.vue +81 -81
- package/packages/input/index.js +5 -5
- package/packages/input/src/main.vue +356 -356
- package/packages/input-number/index.js +5 -5
- package/packages/input-number/src/main.vue +106 -106
- package/packages/label/index.js +5 -5
- package/packages/label/src/main.vue +457 -457
- package/packages/layout/index.js +5 -5
- package/packages/layout/src/item.vue +152 -152
- package/packages/layout/src/main.vue +31 -31
- package/packages/login/.DS_Store +0 -0
- package/packages/login/index.js +5 -5
- package/packages/login/src/main.vue +1935 -1892
- package/packages/login/src/resetPassword.vue +562 -562
- package/packages/main/.DS_Store +0 -0
- package/packages/main/index.js +5 -5
- package/packages/main/src/.DS_Store +0 -0
- package/packages/main/src/default/index.vue +32 -3
- package/packages/main/src/default/message.vue +249 -249
- package/packages/main/src/default/notice.vue +157 -157
- package/packages/main/src/default/userinfo.vue +505 -505
- package/packages/main/src/public/online.vue +89 -89
- package/packages/main/src/public/search.vue +461 -454
- package/packages/main/src/public/settings.vue +221 -221
- package/packages/main/src/simplicity/apps.vue +388 -388
- package/packages/main/src/simplicity/avatar.vue +82 -82
- package/packages/main/src/simplicity/handler.vue +259 -221
- package/packages/main/src/simplicity/index.vue +2047 -1993
- package/packages/main/src/simplicity/lists.vue +84 -84
- package/packages/main/src/simplicity/menu-list.vue +128 -128
- package/packages/main/src/simplicity/message.vue +259 -259
- package/packages/main/src/simplicity/notice.vue +190 -190
- package/packages/main/src/simplicity/router-page.vue +45 -45
- package/packages/main/src/simplicity/sub-menu.vue +241 -241
- package/packages/main/src/simplicity/user.vue +257 -257
- package/packages/main/src/simplicity/userinfo.vue +312 -312
- package/packages/menu/index.js +5 -5
- package/packages/menu/src/main.vue +536 -536
- package/packages/nav/index.js +5 -5
- package/packages/nav/src/main.vue +402 -402
- package/packages/notify/index.js +5 -5
- package/packages/notify/src/main.vue +538 -538
- package/packages/page/index.js +5 -5
- package/packages/page/src/main.vue +167 -167
- package/packages/pagination/index.js +5 -5
- package/packages/pagination/src/main.vue +96 -96
- package/packages/player/index.js +5 -5
- package/packages/player/src/main.vue +194 -194
- package/packages/qr-code/index.js +5 -5
- package/packages/qr-code/src/main.vue +170 -170
- package/packages/radio-group/index.js +6 -6
- package/packages/radio-group/src/main.vue +319 -319
- package/packages/retrial-auth/index.js +5 -5
- package/packages/retrial-auth/src/main.vue +280 -280
- package/packages/select/index.js +5 -5
- package/packages/select/src/main.vue +775 -775
- package/packages/select-ganged/index.js +5 -5
- package/packages/select-ganged/src/main.vue +724 -724
- package/packages/selector/.DS_Store +0 -0
- package/packages/selector/index.js +5 -5
- package/packages/selector/src/main.vue +689 -677
- package/packages/selector-panel/.DS_Store +0 -0
- package/packages/selector-panel/index.js +5 -5
- package/packages/selector-panel/src/main.vue +1027 -1028
- package/packages/selector-panel/src/selection.vue +177 -177
- package/packages/selector-panel/src/tree.vue +129 -129
- package/packages/sizer/.DS_Store +0 -0
- package/packages/sizer/index.js +5 -5
- package/packages/sizer/src/main.vue +254 -254
- package/packages/steps/index.js +5 -5
- package/packages/steps/src/main.vue +181 -181
- package/packages/switch/index.js +5 -5
- package/packages/switch/src/main.vue +154 -154
- package/packages/table-form/index.js +5 -5
- package/packages/tabs/.DS_Store +0 -0
- package/packages/tabs/index.js +5 -5
- package/packages/tabs/src/main.vue +788 -788
- package/packages/tabs-panel/index.js +5 -5
- package/packages/tabs-panel/src/main.vue +29 -29
- package/packages/theme-chalk/lib/base.css +1 -1
- package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
- package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
- package/packages/theme-chalk/lib/icon.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/login.css +1 -1
- package/packages/theme-chalk/lib/main.css +1 -1
- package/packages/theme-chalk/lib/menu.css +1 -1
- package/packages/theme-chalk/lib/simplicity.css +1 -1
- package/packages/theme-chalk/lib/sizer.css +1 -1
- package/packages/theme-chalk/lib/upload.css +1 -1
- package/packages/theme-chalk/src/.DS_Store +0 -0
- package/packages/theme-chalk/src/base.scss +260 -260
- package/packages/theme-chalk/src/button-group.scss +175 -175
- package/packages/theme-chalk/src/button.scss +24 -24
- package/packages/theme-chalk/src/calendar.scss +113 -113
- package/packages/theme-chalk/src/card.scss +99 -99
- package/packages/theme-chalk/src/checkbox-group.scss +8 -8
- package/packages/theme-chalk/src/clients.scss +87 -87
- package/packages/theme-chalk/src/data-table-form.scss +67 -67
- package/packages/theme-chalk/src/data-table.scss +293 -293
- package/packages/theme-chalk/src/date-picker.scss +7 -7
- package/packages/theme-chalk/src/dialog.scss +77 -77
- package/packages/theme-chalk/src/enterprise.scss +5 -5
- package/packages/theme-chalk/src/error-page.scss +18 -18
- package/packages/theme-chalk/src/flow-group.scss +110 -110
- package/packages/theme-chalk/src/flow-list.scss +36 -36
- package/packages/theme-chalk/src/flow.scss +310 -310
- package/packages/theme-chalk/src/fonts/iconfont.ttf +0 -0
- package/packages/theme-chalk/src/fonts/iconfont.woff +0 -0
- package/packages/theme-chalk/src/form.scss +496 -496
- package/packages/theme-chalk/src/handle-user.scss +40 -40
- package/packages/theme-chalk/src/handler.scss +143 -143
- package/packages/theme-chalk/src/icon.scss +1789 -1760
- package/packages/theme-chalk/src/icons.scss +99 -99
- package/packages/theme-chalk/src/input.scss +9 -9
- package/packages/theme-chalk/src/label.scss +24 -24
- package/packages/theme-chalk/src/layout.scss +46 -46
- package/packages/theme-chalk/src/login.scss +947 -939
- package/packages/theme-chalk/src/main.scss +639 -632
- package/packages/theme-chalk/src/menu.scss +222 -222
- package/packages/theme-chalk/src/mixins/color.scss +117 -117
- package/packages/theme-chalk/src/nav.scss +125 -125
- package/packages/theme-chalk/src/page.scss +3 -3
- package/packages/theme-chalk/src/pagination.scss +29 -29
- package/packages/theme-chalk/src/player.scss +9 -9
- package/packages/theme-chalk/src/qr-code.scss +17 -17
- package/packages/theme-chalk/src/radio-group.scss +9 -9
- package/packages/theme-chalk/src/retrial-auth.scss +38 -38
- package/packages/theme-chalk/src/select-ganged.scss +8 -8
- package/packages/theme-chalk/src/select.scss +8 -8
- package/packages/theme-chalk/src/selector-panel.scss +204 -204
- package/packages/theme-chalk/src/selector.scss +91 -91
- package/packages/theme-chalk/src/simplicity.scss +1262 -1262
- package/packages/theme-chalk/src/sizer.scss +36 -36
- package/packages/theme-chalk/src/steps.scss +88 -88
- package/packages/theme-chalk/src/switch.scss +3 -3
- package/packages/theme-chalk/src/table-form.scss +1 -1
- package/packages/theme-chalk/src/tabs.scss +87 -87
- package/packages/theme-chalk/src/tips.scss +7 -7
- package/packages/theme-chalk/src/toolbar.scss +179 -179
- package/packages/theme-chalk/src/tree-group.scss +72 -72
- package/packages/theme-chalk/src/tree.scss +165 -165
- package/packages/theme-chalk/src/upload.scss +167 -167
- package/packages/theme-chalk/src/wxlogin.scss +3 -3
- package/packages/tips/index.js +5 -5
- package/packages/tips/src/main.vue +141 -141
- package/packages/toolbar/index.js +5 -5
- package/packages/toolbar/src/main.vue +430 -430
- package/packages/tree/index.js +5 -5
- package/packages/tree-group/index.js +5 -5
- package/packages/upload/.DS_Store +0 -0
- package/packages/upload/index.js +5 -5
- package/packages/upload/src/main.vue +1334 -1334
- package/packages/upload/src/picture.js +15 -15
- package/packages/wujie/index.js +5 -5
- package/packages/wujie/src/main.vue +145 -145
- package/packages/wxlogin/index.js +5 -5
- package/packages/wxlogin/src/main.vue +128 -128
- package/src/.DS_Store +0 -0
- package/src/config/api.js +248 -248
- package/src/config/image.js +2 -2
- package/src/index.js +157 -157
- package/src/utils/bus.js +3 -3
- package/src/utils/date-util.js +312 -312
- package/src/utils/http.js +50 -50
- package/src/utils/rules.js +18 -18
- package/src/utils/store.js +21 -21
- package/src/utils/util.js +146 -106
- package/src/utils/webSocket.js +107 -107
package/lib/button-group.js
CHANGED
|
@@ -547,10 +547,19 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
547
547
|
if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
|
|
548
548
|
params.userId = getStorage('userId');
|
|
549
549
|
}
|
|
550
|
-
var info = {
|
|
550
|
+
var info = {
|
|
551
|
+
time: 0,
|
|
552
|
+
conversationId: '',
|
|
553
|
+
content: '',
|
|
554
|
+
thinkContent: '',
|
|
555
|
+
primeval: '',
|
|
556
|
+
chunk: ''
|
|
557
|
+
};
|
|
551
558
|
var partialData = '';
|
|
552
559
|
var lastProcessedIndex = 0;
|
|
553
560
|
var done = false;
|
|
561
|
+
var finishThink = false;
|
|
562
|
+
var hasThink = false;
|
|
554
563
|
ajax(_extends({
|
|
555
564
|
timeout: 990000,
|
|
556
565
|
format: false,
|
|
@@ -565,6 +574,9 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
565
574
|
// 获取从上次处理后新增的数据
|
|
566
575
|
var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
|
|
567
576
|
var chunk = currentResponse.slice(lastProcessedIndex);
|
|
577
|
+
if (chunk === 'data:') {
|
|
578
|
+
return;
|
|
579
|
+
}
|
|
568
580
|
|
|
569
581
|
// 更新偏移量
|
|
570
582
|
lastProcessedIndex = currentResponse.length;
|
|
@@ -573,7 +585,12 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
573
585
|
partialData += chunk;
|
|
574
586
|
var lines = partialData.split('\n');
|
|
575
587
|
var remainingData = ''; // 用于保存未完整处理的部分数据
|
|
588
|
+
var primeval = '';
|
|
589
|
+
var chunks = '';
|
|
576
590
|
lines.forEach(function (line) {
|
|
591
|
+
if (line === '') {
|
|
592
|
+
return;
|
|
593
|
+
}
|
|
577
594
|
if (line.startsWith('data:')) {
|
|
578
595
|
var _data = line.replace('data:', '').trim();
|
|
579
596
|
if (_data) {
|
|
@@ -582,8 +599,6 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
582
599
|
var parsedData = JSON.parse(_data);
|
|
583
600
|
info.time = parsedData.time;
|
|
584
601
|
info.conversationId = parsedData.conversationId;
|
|
585
|
-
|
|
586
|
-
// 使用正则表达式匹配 <think> 标签
|
|
587
602
|
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
588
603
|
var match = parsedData.message.match(thinkRegex);
|
|
589
604
|
if (match) {
|
|
@@ -593,20 +608,47 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
593
608
|
info.thinkContent += thinkContent;
|
|
594
609
|
info.content += content;
|
|
595
610
|
} else {
|
|
596
|
-
|
|
597
|
-
|
|
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;
|
|
622
|
+
} else {
|
|
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) {
|
|
632
|
+
info.content += parsedData.message;
|
|
633
|
+
chunks += parsedData.message;
|
|
634
|
+
} else {
|
|
635
|
+
info.thinkContent += parsedData.message;
|
|
636
|
+
}
|
|
637
|
+
}
|
|
598
638
|
}
|
|
639
|
+
primeval += parsedData.message;
|
|
599
640
|
done = parsedData.done;
|
|
600
641
|
} catch (parseError) {
|
|
601
642
|
console.error('解析数据出错:', parseError);
|
|
602
643
|
}
|
|
603
|
-
// Promise.resolve({message: info, controller});
|
|
604
644
|
}
|
|
605
645
|
} else {
|
|
606
646
|
// 保存未处理完的部分数据
|
|
607
647
|
remainingData += line + '\n';
|
|
608
648
|
}
|
|
609
649
|
});
|
|
650
|
+
info.primeval = primeval;
|
|
651
|
+
info.chunk = chunks;
|
|
610
652
|
|
|
611
653
|
// 将未完整处理的数据保留到 partialData 中
|
|
612
654
|
partialData = remainingData;
|
package/lib/button.js
CHANGED
|
@@ -548,10 +548,19 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
548
548
|
if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
|
|
549
549
|
params.userId = getStorage('userId');
|
|
550
550
|
}
|
|
551
|
-
var info = {
|
|
551
|
+
var info = {
|
|
552
|
+
time: 0,
|
|
553
|
+
conversationId: '',
|
|
554
|
+
content: '',
|
|
555
|
+
thinkContent: '',
|
|
556
|
+
primeval: '',
|
|
557
|
+
chunk: ''
|
|
558
|
+
};
|
|
552
559
|
var partialData = '';
|
|
553
560
|
var lastProcessedIndex = 0;
|
|
554
561
|
var done = false;
|
|
562
|
+
var finishThink = false;
|
|
563
|
+
var hasThink = false;
|
|
555
564
|
ajax(_extends({
|
|
556
565
|
timeout: 990000,
|
|
557
566
|
format: false,
|
|
@@ -566,6 +575,9 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
566
575
|
// 获取从上次处理后新增的数据
|
|
567
576
|
var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
|
|
568
577
|
var chunk = currentResponse.slice(lastProcessedIndex);
|
|
578
|
+
if (chunk === 'data:') {
|
|
579
|
+
return;
|
|
580
|
+
}
|
|
569
581
|
|
|
570
582
|
// 更新偏移量
|
|
571
583
|
lastProcessedIndex = currentResponse.length;
|
|
@@ -574,7 +586,12 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
574
586
|
partialData += chunk;
|
|
575
587
|
var lines = partialData.split('\n');
|
|
576
588
|
var remainingData = ''; // 用于保存未完整处理的部分数据
|
|
589
|
+
var primeval = '';
|
|
590
|
+
var chunks = '';
|
|
577
591
|
lines.forEach(function (line) {
|
|
592
|
+
if (line === '') {
|
|
593
|
+
return;
|
|
594
|
+
}
|
|
578
595
|
if (line.startsWith('data:')) {
|
|
579
596
|
var _data = line.replace('data:', '').trim();
|
|
580
597
|
if (_data) {
|
|
@@ -583,8 +600,6 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
583
600
|
var parsedData = JSON.parse(_data);
|
|
584
601
|
info.time = parsedData.time;
|
|
585
602
|
info.conversationId = parsedData.conversationId;
|
|
586
|
-
|
|
587
|
-
// 使用正则表达式匹配 <think> 标签
|
|
588
603
|
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
589
604
|
var match = parsedData.message.match(thinkRegex);
|
|
590
605
|
if (match) {
|
|
@@ -594,20 +609,47 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
594
609
|
info.thinkContent += thinkContent;
|
|
595
610
|
info.content += content;
|
|
596
611
|
} else {
|
|
597
|
-
|
|
598
|
-
|
|
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;
|
|
623
|
+
} else {
|
|
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) {
|
|
633
|
+
info.content += parsedData.message;
|
|
634
|
+
chunks += parsedData.message;
|
|
635
|
+
} else {
|
|
636
|
+
info.thinkContent += parsedData.message;
|
|
637
|
+
}
|
|
638
|
+
}
|
|
599
639
|
}
|
|
640
|
+
primeval += parsedData.message;
|
|
600
641
|
done = parsedData.done;
|
|
601
642
|
} catch (parseError) {
|
|
602
643
|
console.error('解析数据出错:', parseError);
|
|
603
644
|
}
|
|
604
|
-
// Promise.resolve({message: info, controller});
|
|
605
645
|
}
|
|
606
646
|
} else {
|
|
607
647
|
// 保存未处理完的部分数据
|
|
608
648
|
remainingData += line + '\n';
|
|
609
649
|
}
|
|
610
650
|
});
|
|
651
|
+
info.primeval = primeval;
|
|
652
|
+
info.chunk = chunks;
|
|
611
653
|
|
|
612
654
|
// 将未完整处理的数据保留到 partialData 中
|
|
613
655
|
partialData = remainingData;
|
package/lib/checkbox-group.js
CHANGED
|
@@ -547,10 +547,19 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
547
547
|
if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
|
|
548
548
|
params.userId = getStorage('userId');
|
|
549
549
|
}
|
|
550
|
-
var info = {
|
|
550
|
+
var info = {
|
|
551
|
+
time: 0,
|
|
552
|
+
conversationId: '',
|
|
553
|
+
content: '',
|
|
554
|
+
thinkContent: '',
|
|
555
|
+
primeval: '',
|
|
556
|
+
chunk: ''
|
|
557
|
+
};
|
|
551
558
|
var partialData = '';
|
|
552
559
|
var lastProcessedIndex = 0;
|
|
553
560
|
var done = false;
|
|
561
|
+
var finishThink = false;
|
|
562
|
+
var hasThink = false;
|
|
554
563
|
ajax(_extends({
|
|
555
564
|
timeout: 990000,
|
|
556
565
|
format: false,
|
|
@@ -565,6 +574,9 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
565
574
|
// 获取从上次处理后新增的数据
|
|
566
575
|
var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
|
|
567
576
|
var chunk = currentResponse.slice(lastProcessedIndex);
|
|
577
|
+
if (chunk === 'data:') {
|
|
578
|
+
return;
|
|
579
|
+
}
|
|
568
580
|
|
|
569
581
|
// 更新偏移量
|
|
570
582
|
lastProcessedIndex = currentResponse.length;
|
|
@@ -573,7 +585,12 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
573
585
|
partialData += chunk;
|
|
574
586
|
var lines = partialData.split('\n');
|
|
575
587
|
var remainingData = ''; // 用于保存未完整处理的部分数据
|
|
588
|
+
var primeval = '';
|
|
589
|
+
var chunks = '';
|
|
576
590
|
lines.forEach(function (line) {
|
|
591
|
+
if (line === '') {
|
|
592
|
+
return;
|
|
593
|
+
}
|
|
577
594
|
if (line.startsWith('data:')) {
|
|
578
595
|
var _data = line.replace('data:', '').trim();
|
|
579
596
|
if (_data) {
|
|
@@ -582,8 +599,6 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
582
599
|
var parsedData = JSON.parse(_data);
|
|
583
600
|
info.time = parsedData.time;
|
|
584
601
|
info.conversationId = parsedData.conversationId;
|
|
585
|
-
|
|
586
|
-
// 使用正则表达式匹配 <think> 标签
|
|
587
602
|
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
588
603
|
var match = parsedData.message.match(thinkRegex);
|
|
589
604
|
if (match) {
|
|
@@ -593,20 +608,47 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
593
608
|
info.thinkContent += thinkContent;
|
|
594
609
|
info.content += content;
|
|
595
610
|
} else {
|
|
596
|
-
|
|
597
|
-
|
|
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;
|
|
622
|
+
} else {
|
|
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) {
|
|
632
|
+
info.content += parsedData.message;
|
|
633
|
+
chunks += parsedData.message;
|
|
634
|
+
} else {
|
|
635
|
+
info.thinkContent += parsedData.message;
|
|
636
|
+
}
|
|
637
|
+
}
|
|
598
638
|
}
|
|
639
|
+
primeval += parsedData.message;
|
|
599
640
|
done = parsedData.done;
|
|
600
641
|
} catch (parseError) {
|
|
601
642
|
console.error('解析数据出错:', parseError);
|
|
602
643
|
}
|
|
603
|
-
// Promise.resolve({message: info, controller});
|
|
604
644
|
}
|
|
605
645
|
} else {
|
|
606
646
|
// 保存未处理完的部分数据
|
|
607
647
|
remainingData += line + '\n';
|
|
608
648
|
}
|
|
609
649
|
});
|
|
650
|
+
info.primeval = primeval;
|
|
651
|
+
info.chunk = chunks;
|
|
610
652
|
|
|
611
653
|
// 将未完整处理的数据保留到 partialData 中
|
|
612
654
|
partialData = remainingData;
|
package/lib/data-table-form.js
CHANGED
|
@@ -547,10 +547,19 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
547
547
|
if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
|
|
548
548
|
params.userId = getStorage('userId');
|
|
549
549
|
}
|
|
550
|
-
var info = {
|
|
550
|
+
var info = {
|
|
551
|
+
time: 0,
|
|
552
|
+
conversationId: '',
|
|
553
|
+
content: '',
|
|
554
|
+
thinkContent: '',
|
|
555
|
+
primeval: '',
|
|
556
|
+
chunk: ''
|
|
557
|
+
};
|
|
551
558
|
var partialData = '';
|
|
552
559
|
var lastProcessedIndex = 0;
|
|
553
560
|
var done = false;
|
|
561
|
+
var finishThink = false;
|
|
562
|
+
var hasThink = false;
|
|
554
563
|
ajax(_extends({
|
|
555
564
|
timeout: 990000,
|
|
556
565
|
format: false,
|
|
@@ -565,6 +574,9 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
565
574
|
// 获取从上次处理后新增的数据
|
|
566
575
|
var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
|
|
567
576
|
var chunk = currentResponse.slice(lastProcessedIndex);
|
|
577
|
+
if (chunk === 'data:') {
|
|
578
|
+
return;
|
|
579
|
+
}
|
|
568
580
|
|
|
569
581
|
// 更新偏移量
|
|
570
582
|
lastProcessedIndex = currentResponse.length;
|
|
@@ -573,7 +585,12 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
573
585
|
partialData += chunk;
|
|
574
586
|
var lines = partialData.split('\n');
|
|
575
587
|
var remainingData = ''; // 用于保存未完整处理的部分数据
|
|
588
|
+
var primeval = '';
|
|
589
|
+
var chunks = '';
|
|
576
590
|
lines.forEach(function (line) {
|
|
591
|
+
if (line === '') {
|
|
592
|
+
return;
|
|
593
|
+
}
|
|
577
594
|
if (line.startsWith('data:')) {
|
|
578
595
|
var _data = line.replace('data:', '').trim();
|
|
579
596
|
if (_data) {
|
|
@@ -582,8 +599,6 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
582
599
|
var parsedData = JSON.parse(_data);
|
|
583
600
|
info.time = parsedData.time;
|
|
584
601
|
info.conversationId = parsedData.conversationId;
|
|
585
|
-
|
|
586
|
-
// 使用正则表达式匹配 <think> 标签
|
|
587
602
|
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
588
603
|
var match = parsedData.message.match(thinkRegex);
|
|
589
604
|
if (match) {
|
|
@@ -593,20 +608,47 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
593
608
|
info.thinkContent += thinkContent;
|
|
594
609
|
info.content += content;
|
|
595
610
|
} else {
|
|
596
|
-
|
|
597
|
-
|
|
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;
|
|
622
|
+
} else {
|
|
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) {
|
|
632
|
+
info.content += parsedData.message;
|
|
633
|
+
chunks += parsedData.message;
|
|
634
|
+
} else {
|
|
635
|
+
info.thinkContent += parsedData.message;
|
|
636
|
+
}
|
|
637
|
+
}
|
|
598
638
|
}
|
|
639
|
+
primeval += parsedData.message;
|
|
599
640
|
done = parsedData.done;
|
|
600
641
|
} catch (parseError) {
|
|
601
642
|
console.error('解析数据出错:', parseError);
|
|
602
643
|
}
|
|
603
|
-
// Promise.resolve({message: info, controller});
|
|
604
644
|
}
|
|
605
645
|
} else {
|
|
606
646
|
// 保存未处理完的部分数据
|
|
607
647
|
remainingData += line + '\n';
|
|
608
648
|
}
|
|
609
649
|
});
|
|
650
|
+
info.primeval = primeval;
|
|
651
|
+
info.chunk = chunks;
|
|
610
652
|
|
|
611
653
|
// 将未完整处理的数据保留到 partialData 中
|
|
612
654
|
partialData = remainingData;
|
package/lib/data-table.js
CHANGED
|
@@ -547,10 +547,19 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
547
547
|
if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
|
|
548
548
|
params.userId = getStorage('userId');
|
|
549
549
|
}
|
|
550
|
-
var info = {
|
|
550
|
+
var info = {
|
|
551
|
+
time: 0,
|
|
552
|
+
conversationId: '',
|
|
553
|
+
content: '',
|
|
554
|
+
thinkContent: '',
|
|
555
|
+
primeval: '',
|
|
556
|
+
chunk: ''
|
|
557
|
+
};
|
|
551
558
|
var partialData = '';
|
|
552
559
|
var lastProcessedIndex = 0;
|
|
553
560
|
var done = false;
|
|
561
|
+
var finishThink = false;
|
|
562
|
+
var hasThink = false;
|
|
554
563
|
ajax(_extends({
|
|
555
564
|
timeout: 990000,
|
|
556
565
|
format: false,
|
|
@@ -565,6 +574,9 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
565
574
|
// 获取从上次处理后新增的数据
|
|
566
575
|
var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
|
|
567
576
|
var chunk = currentResponse.slice(lastProcessedIndex);
|
|
577
|
+
if (chunk === 'data:') {
|
|
578
|
+
return;
|
|
579
|
+
}
|
|
568
580
|
|
|
569
581
|
// 更新偏移量
|
|
570
582
|
lastProcessedIndex = currentResponse.length;
|
|
@@ -573,7 +585,12 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
573
585
|
partialData += chunk;
|
|
574
586
|
var lines = partialData.split('\n');
|
|
575
587
|
var remainingData = ''; // 用于保存未完整处理的部分数据
|
|
588
|
+
var primeval = '';
|
|
589
|
+
var chunks = '';
|
|
576
590
|
lines.forEach(function (line) {
|
|
591
|
+
if (line === '') {
|
|
592
|
+
return;
|
|
593
|
+
}
|
|
577
594
|
if (line.startsWith('data:')) {
|
|
578
595
|
var _data = line.replace('data:', '').trim();
|
|
579
596
|
if (_data) {
|
|
@@ -582,8 +599,6 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
582
599
|
var parsedData = JSON.parse(_data);
|
|
583
600
|
info.time = parsedData.time;
|
|
584
601
|
info.conversationId = parsedData.conversationId;
|
|
585
|
-
|
|
586
|
-
// 使用正则表达式匹配 <think> 标签
|
|
587
602
|
var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
|
|
588
603
|
var match = parsedData.message.match(thinkRegex);
|
|
589
604
|
if (match) {
|
|
@@ -593,20 +608,47 @@ var ajaxStream = function ajaxStream(_ref2) {
|
|
|
593
608
|
info.thinkContent += thinkContent;
|
|
594
609
|
info.content += content;
|
|
595
610
|
} else {
|
|
596
|
-
|
|
597
|
-
|
|
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;
|
|
622
|
+
} else {
|
|
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) {
|
|
632
|
+
info.content += parsedData.message;
|
|
633
|
+
chunks += parsedData.message;
|
|
634
|
+
} else {
|
|
635
|
+
info.thinkContent += parsedData.message;
|
|
636
|
+
}
|
|
637
|
+
}
|
|
598
638
|
}
|
|
639
|
+
primeval += parsedData.message;
|
|
599
640
|
done = parsedData.done;
|
|
600
641
|
} catch (parseError) {
|
|
601
642
|
console.error('解析数据出错:', parseError);
|
|
602
643
|
}
|
|
603
|
-
// Promise.resolve({message: info, controller});
|
|
604
644
|
}
|
|
605
645
|
} else {
|
|
606
646
|
// 保存未处理完的部分数据
|
|
607
647
|
remainingData += line + '\n';
|
|
608
648
|
}
|
|
609
649
|
});
|
|
650
|
+
info.primeval = primeval;
|
|
651
|
+
info.chunk = chunks;
|
|
610
652
|
|
|
611
653
|
// 将未完整处理的数据保留到 partialData 中
|
|
612
654
|
partialData = remainingData;
|
|
@@ -4137,8 +4179,8 @@ module.exports = require("babel-runtime/regenerator");
|
|
|
4137
4179
|
// ESM COMPAT FLAG
|
|
4138
4180
|
__webpack_require__.r(__webpack_exports__);
|
|
4139
4181
|
|
|
4140
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=
|
|
4141
|
-
var
|
|
4182
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=6d159d95&
|
|
4183
|
+
var mainvue_type_template_id_6d159d95_render = function () {
|
|
4142
4184
|
var _vm = this
|
|
4143
4185
|
var _h = _vm.$createElement
|
|
4144
4186
|
var _c = _vm._self._c || _h
|
|
@@ -4539,10 +4581,10 @@ var mainvue_type_template_id_2246a7e8_render = function () {
|
|
|
4539
4581
|
)
|
|
4540
4582
|
}
|
|
4541
4583
|
var staticRenderFns = []
|
|
4542
|
-
|
|
4584
|
+
mainvue_type_template_id_6d159d95_render._withStripped = true
|
|
4543
4585
|
|
|
4544
4586
|
|
|
4545
|
-
// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=
|
|
4587
|
+
// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=6d159d95&
|
|
4546
4588
|
|
|
4547
4589
|
// EXTERNAL MODULE: ./src/config/api.js
|
|
4548
4590
|
var api = __webpack_require__(1);
|
|
@@ -4606,8 +4648,8 @@ childrenvue_type_template_id_271bb842_render._withStripped = true
|
|
|
4606
4648
|
|
|
4607
4649
|
// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=271bb842&
|
|
4608
4650
|
|
|
4609
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=
|
|
4610
|
-
var
|
|
4651
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=4d1a48b2&
|
|
4652
|
+
var columnvue_type_template_id_4d1a48b2_render = function () {
|
|
4611
4653
|
var _vm = this
|
|
4612
4654
|
var _h = _vm.$createElement
|
|
4613
4655
|
var _c = _vm._self._c || _h
|
|
@@ -5341,6 +5383,7 @@ var columnvue_type_template_id_f7b1c668_render = function () {
|
|
|
5341
5383
|
row: scope.row,
|
|
5342
5384
|
render: _vm.render,
|
|
5343
5385
|
index: _vm.indexs,
|
|
5386
|
+
options: _vm.optionDatas,
|
|
5344
5387
|
},
|
|
5345
5388
|
})
|
|
5346
5389
|
: _vm.dateFormat
|
|
@@ -5421,11 +5464,11 @@ var columnvue_type_template_id_f7b1c668_render = function () {
|
|
|
5421
5464
|
2
|
|
5422
5465
|
)
|
|
5423
5466
|
}
|
|
5424
|
-
var
|
|
5425
|
-
|
|
5467
|
+
var columnvue_type_template_id_4d1a48b2_staticRenderFns = []
|
|
5468
|
+
columnvue_type_template_id_4d1a48b2_render._withStripped = true
|
|
5426
5469
|
|
|
5427
5470
|
|
|
5428
|
-
// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=
|
|
5471
|
+
// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=4d1a48b2&
|
|
5429
5472
|
|
|
5430
5473
|
// EXTERNAL MODULE: external "babel-runtime/regenerator"
|
|
5431
5474
|
var regenerator_ = __webpack_require__(14);
|
|
@@ -5911,6 +5954,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
5911
5954
|
//
|
|
5912
5955
|
//
|
|
5913
5956
|
//
|
|
5957
|
+
//
|
|
5914
5958
|
|
|
5915
5959
|
|
|
5916
5960
|
|
|
@@ -5926,7 +5970,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
5926
5970
|
column: {
|
|
5927
5971
|
type: Object,
|
|
5928
5972
|
default: null
|
|
5929
|
-
}
|
|
5973
|
+
},
|
|
5974
|
+
options: Object
|
|
5930
5975
|
},
|
|
5931
5976
|
render: function render(h, ctx) {
|
|
5932
5977
|
var params = {
|
|
@@ -5938,12 +5983,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
5938
5983
|
}
|
|
5939
5984
|
if (typeof ctx.props.render == 'string') {
|
|
5940
5985
|
try {
|
|
5941
|
-
return util["a" /* default */].toFunction(ctx.props.render)(h, params);
|
|
5986
|
+
return util["a" /* default */].toFunction(ctx.props.render)(h, params, ctx.props.options);
|
|
5942
5987
|
} catch (error) {
|
|
5943
5988
|
throw error;
|
|
5944
5989
|
}
|
|
5945
5990
|
}
|
|
5946
|
-
return ctx.props.render(h, params);
|
|
5991
|
+
return ctx.props.render(h, params, ctx.props.options);
|
|
5947
5992
|
}
|
|
5948
5993
|
}
|
|
5949
5994
|
},
|
|
@@ -6370,8 +6415,8 @@ var componentNormalizer = __webpack_require__(3);
|
|
|
6370
6415
|
|
|
6371
6416
|
var component = Object(componentNormalizer["a" /* default */])(
|
|
6372
6417
|
src_columnvue_type_script_lang_js_,
|
|
6373
|
-
|
|
6374
|
-
|
|
6418
|
+
columnvue_type_template_id_4d1a48b2_render,
|
|
6419
|
+
columnvue_type_template_id_4d1a48b2_staticRenderFns,
|
|
6375
6420
|
false,
|
|
6376
6421
|
null,
|
|
6377
6422
|
null,
|
|
@@ -8292,7 +8337,7 @@ var pageView = util["a" /* default */].getParams('pageView');
|
|
|
8292
8337
|
}
|
|
8293
8338
|
}
|
|
8294
8339
|
height -= _this15.showToolbar ? _this15.$refs.toolbar.$el.offsetHeight : 0;
|
|
8295
|
-
height -= _this15.page === false ? 0 : _this15.$refs.pagination.$el.offsetHeight;
|
|
8340
|
+
height -= _this15.page === false || _this15.showPage == false ? 0 : _this15.$refs.pagination.$el.offsetHeight;
|
|
8296
8341
|
height -= _this15.title ? _this15.$refs.title.offsetHeight : 0;
|
|
8297
8342
|
height -= parseInt(util["a" /* default */].getStyle(_this15.$refs.esTableContent, 'padding-top'), 10);
|
|
8298
8343
|
height -= parseInt(util["a" /* default */].getStyle(_this15.$refs.esTableContent, 'padding-bottom'), 10);
|
|
@@ -8416,7 +8461,7 @@ var pageView = util["a" /* default */].getParams('pageView');
|
|
|
8416
8461
|
|
|
8417
8462
|
var main_component = Object(componentNormalizer["a" /* default */])(
|
|
8418
8463
|
src_mainvue_type_script_lang_js_,
|
|
8419
|
-
|
|
8464
|
+
mainvue_type_template_id_6d159d95_render,
|
|
8420
8465
|
staticRenderFns,
|
|
8421
8466
|
false,
|
|
8422
8467
|
null,
|