eoss-ui 0.5.73 → 0.5.75
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 +115 -29
- package/lib/button.js +115 -29
- package/lib/checkbox-group.js +115 -29
- package/lib/clients.js +16 -7
- package/lib/data-table-form.js +115 -29
- package/lib/data-table.js +130 -35
- package/lib/date-picker.js +115 -29
- package/lib/dialog.js +115 -29
- package/lib/eoss-ui.common.js +345 -133
- package/lib/flow-group.js +115 -29
- package/lib/flow-list.js +115 -29
- package/lib/flow.js +115 -29
- package/lib/form.js +115 -29
- package/lib/handle-user.js +115 -29
- package/lib/handler.js +115 -29
- package/lib/index.js +1 -1
- package/lib/input-number.js +114 -28
- package/lib/input.js +131 -35
- package/lib/login.js +147 -40
- package/lib/main.js +197 -51
- package/lib/nav.js +163 -52
- package/lib/page.js +115 -29
- package/lib/player.js +115 -29
- package/lib/qr-code.js +115 -29
- package/lib/radio-group.js +115 -29
- package/lib/retrial-auth.js +115 -29
- package/lib/select-ganged.js +115 -29
- package/lib/select.js +130 -34
- package/lib/selector-panel.js +115 -29
- package/lib/selector.js +115 -29
- package/lib/sizer.js +115 -29
- package/lib/steps.js +115 -29
- package/lib/switch.js +114 -28
- package/lib/table-form.js +115 -29
- package/lib/tabs.js +115 -29
- package/lib/theme-chalk/base.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/nav.css +1 -1
- package/lib/theme-chalk/sizer.css +1 -1
- package/lib/theme-chalk/upload.css +1 -1
- package/lib/tips.js +115 -29
- package/lib/tree-group.js +115 -29
- package/lib/tree.js +115 -29
- package/lib/upload.js +115 -29
- package/lib/utils/util.js +98 -22
- package/lib/utils/webSocket.js +16 -6
- package/lib/wujie.js +115 -29
- package/lib/wxlogin.js +114 -28
- package/package.json +2 -2
- package/packages/clients/src/main.vue +3 -1
- package/packages/data-table/src/main.vue +10 -1
- package/packages/input/src/main.vue +7 -6
- package/packages/login/src/main.vue +13 -0
- package/packages/login/src/resetPassword.vue +1 -1
- package/packages/main/src/main.vue +44 -10
- package/packages/nav/src/main.vue +25 -8
- package/packages/select/src/main.vue +6 -5
- package/packages/theme-chalk/lib/base.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/nav.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/base.scss +3 -0
- package/packages/theme-chalk/src/login.scss +175 -171
- package/packages/theme-chalk/src/main.scss +5 -2
- package/packages/theme-chalk/src/nav.scss +4 -1
- package/src/index.js +1 -1
- package/src/utils/util.js +112 -23
- package/src/utils/webSocket.js +14 -7
package/lib/input-number.js
CHANGED
|
@@ -621,6 +621,35 @@ var calculateNetworkDays = function calculateNetworkDays(start_date, end_date) {
|
|
|
621
621
|
return workdays;
|
|
622
622
|
};
|
|
623
623
|
|
|
624
|
+
/**
|
|
625
|
+
* chunkToChinese
|
|
626
|
+
* @desc 将四位数的整数转换为中文大写
|
|
627
|
+
* @param {number} chunk - 数字
|
|
628
|
+
**/
|
|
629
|
+
function chunkToChinese(chunk) {
|
|
630
|
+
var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
|
|
631
|
+
var capitalDigits = ['', '拾', '佰', '仟'];
|
|
632
|
+
|
|
633
|
+
var result = '';
|
|
634
|
+
var digitIndex = 0;
|
|
635
|
+
|
|
636
|
+
while (chunk > 0) {
|
|
637
|
+
var digit = chunk % 10;
|
|
638
|
+
if (digit > 0) {
|
|
639
|
+
result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
|
|
640
|
+
} else {
|
|
641
|
+
// 当前数字是零,需要判断是否需要添加零
|
|
642
|
+
if (result.charAt(0) !== '零') {
|
|
643
|
+
result = '零' + result;
|
|
644
|
+
}
|
|
645
|
+
}
|
|
646
|
+
chunk = Math.floor(chunk / 10);
|
|
647
|
+
digitIndex++;
|
|
648
|
+
}
|
|
649
|
+
|
|
650
|
+
return result;
|
|
651
|
+
}
|
|
652
|
+
|
|
624
653
|
/**
|
|
625
654
|
* concatenate
|
|
626
655
|
* @desc 指定连接符合并文本
|
|
@@ -1816,6 +1845,31 @@ var getWeekday = function getWeekday(date) {
|
|
|
1816
1845
|
return adjustedDay === 0 ? 7 : adjustedDay;
|
|
1817
1846
|
};
|
|
1818
1847
|
|
|
1848
|
+
/**
|
|
1849
|
+
* getZoom
|
|
1850
|
+
* @desc 获取缩放比
|
|
1851
|
+
* @param {number} n - 可选参数,表示星期的起始日,0 表示星期天,1 表示星期一,以此类推,默认为 0
|
|
1852
|
+
**/
|
|
1853
|
+
var getZoom = function getZoom() {
|
|
1854
|
+
var ratio = 0;
|
|
1855
|
+
var screen = window.screen;
|
|
1856
|
+
var ua = navigator.userAgent.toLowerCase();
|
|
1857
|
+
if (window.devicePixelRatio !== undefined) {
|
|
1858
|
+
ratio = window.devicePixelRatio;
|
|
1859
|
+
} else if (~ua.indexOf('msie')) {
|
|
1860
|
+
if (screen.deviceXDPI && screen.logicalXDPI) {
|
|
1861
|
+
ratio = screen.deviceXDPI / screen.logicalXDPI;
|
|
1862
|
+
}
|
|
1863
|
+
} else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
|
|
1864
|
+
ratio = window.outerWidth / window.innerWidth;
|
|
1865
|
+
}
|
|
1866
|
+
|
|
1867
|
+
if (ratio) {
|
|
1868
|
+
ratio = Math.round(ratio * 100);
|
|
1869
|
+
}
|
|
1870
|
+
|
|
1871
|
+
return ratio / 100;
|
|
1872
|
+
};
|
|
1819
1873
|
/**
|
|
1820
1874
|
* handlerUrl
|
|
1821
1875
|
* @desc:更新url参数中的时间戳
|
|
@@ -2558,32 +2612,53 @@ var rmbToCapital = function rmbToCapital(number) {
|
|
|
2558
2612
|
|
|
2559
2613
|
return result;
|
|
2560
2614
|
};
|
|
2615
|
+
/**
|
|
2616
|
+
* setScale
|
|
2617
|
+
* @desc 设置缩放
|
|
2618
|
+
* @param {number} width - 分辨率宽度
|
|
2619
|
+
* @param {number} height - 分辨率高度
|
|
2620
|
+
**/
|
|
2621
|
+
var setScale = function setScale() {
|
|
2622
|
+
var width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1920;
|
|
2623
|
+
var height = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1080;
|
|
2561
2624
|
|
|
2562
|
-
|
|
2563
|
-
|
|
2564
|
-
var
|
|
2565
|
-
|
|
2566
|
-
|
|
2567
|
-
|
|
2568
|
-
|
|
2569
|
-
|
|
2570
|
-
|
|
2571
|
-
|
|
2572
|
-
|
|
2573
|
-
|
|
2625
|
+
var n = 1;
|
|
2626
|
+
var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
|
|
2627
|
+
var zoom = getZoom();
|
|
2628
|
+
if (isMac) {
|
|
2629
|
+
n = 2;
|
|
2630
|
+
} else {
|
|
2631
|
+
n = 1;
|
|
2632
|
+
}
|
|
2633
|
+
if (zoom === 1) {
|
|
2634
|
+
document.body.style.removeProperty('transform');
|
|
2635
|
+
document.body.style.removeProperty('width');
|
|
2636
|
+
document.body.style.removeProperty('height');
|
|
2637
|
+
document.body.style.removeProperty('transform-origin');
|
|
2638
|
+
return;
|
|
2639
|
+
}
|
|
2640
|
+
if (Math.abs(parseInt(width - window.innerWidth * zoom / n, 10)) > 15 && window.innerWidth * zoom / n !== width) {
|
|
2641
|
+
var scale = 'scale(' + window.innerWidth * zoom / width / zoom + ',' + window.innerHeight * zoom / height / zoom + ')';
|
|
2642
|
+
document.body.style.transform = scale;
|
|
2643
|
+
document.body.style.width = width + 'px';
|
|
2644
|
+
document.body.style.height = height + 'px';
|
|
2645
|
+
document.body.style.transformOrigin = '0 0';
|
|
2646
|
+
} else {
|
|
2647
|
+
if (isMac) {
|
|
2648
|
+
var _scale = 'scale(' + 1 * n / zoom + ')';
|
|
2649
|
+
document.body.style.transform = _scale;
|
|
2650
|
+
document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
|
|
2651
|
+
document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
|
|
2652
|
+
document.body.style.transformOrigin = '0 0';
|
|
2574
2653
|
} else {
|
|
2575
|
-
|
|
2576
|
-
|
|
2577
|
-
|
|
2578
|
-
|
|
2654
|
+
var _scale2 = 'scale(' + 1 * n / zoom + ')';
|
|
2655
|
+
document.body.style.transform = _scale2;
|
|
2656
|
+
document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
|
|
2657
|
+
document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
|
|
2658
|
+
document.body.style.transformOrigin = '0 0';
|
|
2579
2659
|
}
|
|
2580
|
-
chunk = Math.floor(chunk / 10);
|
|
2581
|
-
digitIndex++;
|
|
2582
2660
|
}
|
|
2583
|
-
|
|
2584
|
-
return result;
|
|
2585
|
-
}
|
|
2586
|
-
|
|
2661
|
+
};
|
|
2587
2662
|
/**
|
|
2588
2663
|
* sendMessage
|
|
2589
2664
|
* @desc:向iframe发送信息
|
|
@@ -3119,6 +3194,7 @@ var watermark = function watermark(option) {
|
|
|
3119
3194
|
rmbToCapital: rmbToCapital,
|
|
3120
3195
|
sendMessage: sendMessage,
|
|
3121
3196
|
setFavicon: setFavicon,
|
|
3197
|
+
setScale: setScale,
|
|
3122
3198
|
setStorage: setStorage,
|
|
3123
3199
|
socket: socket,
|
|
3124
3200
|
startWith: startWith,
|
|
@@ -3658,6 +3734,8 @@ var WebSocket = function () {
|
|
|
3658
3734
|
this.connects = 1;
|
|
3659
3735
|
this.recon = false;
|
|
3660
3736
|
this.sendTimeout = null;
|
|
3737
|
+
this.socket = null;
|
|
3738
|
+
this.subscription = null;
|
|
3661
3739
|
}
|
|
3662
3740
|
|
|
3663
3741
|
/** socket连接 */
|
|
@@ -3668,14 +3746,12 @@ var WebSocket = function () {
|
|
|
3668
3746
|
|
|
3669
3747
|
if (!this.client) {
|
|
3670
3748
|
// 连接SockJS
|
|
3671
|
-
|
|
3672
|
-
|
|
3673
|
-
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
|
|
3749
|
+
this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
|
|
3750
|
+
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
|
|
3674
3751
|
}
|
|
3675
3752
|
|
|
3676
3753
|
// 日志不打印
|
|
3677
3754
|
if (!this.debug) {
|
|
3678
|
-
console.log(111);
|
|
3679
3755
|
this.client.debug = function () {};
|
|
3680
3756
|
}
|
|
3681
3757
|
|
|
@@ -3687,9 +3763,10 @@ var WebSocket = function () {
|
|
|
3687
3763
|
// 订阅消息
|
|
3688
3764
|
_this.subscribe();
|
|
3689
3765
|
}, function (error) {
|
|
3766
|
+
_this.unsubscribe();
|
|
3767
|
+
_this.client = null;
|
|
3690
3768
|
var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
|
|
3691
3769
|
if (_this.connects > 5 && diffSecond < _this.interval) {
|
|
3692
|
-
_this.client.disconnect();
|
|
3693
3770
|
_this.error && _this.error(error);
|
|
3694
3771
|
} else {
|
|
3695
3772
|
_this.reconTimeout = setTimeout(function () {
|
|
@@ -3698,6 +3775,14 @@ var WebSocket = function () {
|
|
|
3698
3775
|
}, 5000);
|
|
3699
3776
|
}
|
|
3700
3777
|
});
|
|
3778
|
+
}; // 清除订阅
|
|
3779
|
+
|
|
3780
|
+
|
|
3781
|
+
WebSocket.prototype.unsubscribe = function unsubscribe() {
|
|
3782
|
+
if (this.subscription) {
|
|
3783
|
+
this.subscription.unsubscribe();
|
|
3784
|
+
this.subscription = null;
|
|
3785
|
+
}
|
|
3701
3786
|
};
|
|
3702
3787
|
/** 订阅服务端 */
|
|
3703
3788
|
|
|
@@ -3706,7 +3791,7 @@ var WebSocket = function () {
|
|
|
3706
3791
|
var _this2 = this;
|
|
3707
3792
|
|
|
3708
3793
|
// 订阅服务端提供的某个topic
|
|
3709
|
-
this.client.subscribe(this.take, function (response) {
|
|
3794
|
+
this.subscription = this.client.subscribe(this.take, function (response) {
|
|
3710
3795
|
if (response && (_this2.callback || _this2.success)) {
|
|
3711
3796
|
var callback = _this2.callback || _this2.success;
|
|
3712
3797
|
callback(JSON.parse(response.body));
|
|
@@ -3747,6 +3832,7 @@ var WebSocket = function () {
|
|
|
3747
3832
|
|
|
3748
3833
|
WebSocket.prototype.destroy = function destroy() {
|
|
3749
3834
|
// 断开连接,清除定时器
|
|
3835
|
+
this.unsubscribe();
|
|
3750
3836
|
if (this.client) {
|
|
3751
3837
|
this.client.disconnect();
|
|
3752
3838
|
};
|
package/lib/input.js
CHANGED
|
@@ -621,6 +621,35 @@ var calculateNetworkDays = function calculateNetworkDays(start_date, end_date) {
|
|
|
621
621
|
return workdays;
|
|
622
622
|
};
|
|
623
623
|
|
|
624
|
+
/**
|
|
625
|
+
* chunkToChinese
|
|
626
|
+
* @desc 将四位数的整数转换为中文大写
|
|
627
|
+
* @param {number} chunk - 数字
|
|
628
|
+
**/
|
|
629
|
+
function chunkToChinese(chunk) {
|
|
630
|
+
var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
|
|
631
|
+
var capitalDigits = ['', '拾', '佰', '仟'];
|
|
632
|
+
|
|
633
|
+
var result = '';
|
|
634
|
+
var digitIndex = 0;
|
|
635
|
+
|
|
636
|
+
while (chunk > 0) {
|
|
637
|
+
var digit = chunk % 10;
|
|
638
|
+
if (digit > 0) {
|
|
639
|
+
result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
|
|
640
|
+
} else {
|
|
641
|
+
// 当前数字是零,需要判断是否需要添加零
|
|
642
|
+
if (result.charAt(0) !== '零') {
|
|
643
|
+
result = '零' + result;
|
|
644
|
+
}
|
|
645
|
+
}
|
|
646
|
+
chunk = Math.floor(chunk / 10);
|
|
647
|
+
digitIndex++;
|
|
648
|
+
}
|
|
649
|
+
|
|
650
|
+
return result;
|
|
651
|
+
}
|
|
652
|
+
|
|
624
653
|
/**
|
|
625
654
|
* concatenate
|
|
626
655
|
* @desc 指定连接符合并文本
|
|
@@ -1816,6 +1845,31 @@ var getWeekday = function getWeekday(date) {
|
|
|
1816
1845
|
return adjustedDay === 0 ? 7 : adjustedDay;
|
|
1817
1846
|
};
|
|
1818
1847
|
|
|
1848
|
+
/**
|
|
1849
|
+
* getZoom
|
|
1850
|
+
* @desc 获取缩放比
|
|
1851
|
+
* @param {number} n - 可选参数,表示星期的起始日,0 表示星期天,1 表示星期一,以此类推,默认为 0
|
|
1852
|
+
**/
|
|
1853
|
+
var getZoom = function getZoom() {
|
|
1854
|
+
var ratio = 0;
|
|
1855
|
+
var screen = window.screen;
|
|
1856
|
+
var ua = navigator.userAgent.toLowerCase();
|
|
1857
|
+
if (window.devicePixelRatio !== undefined) {
|
|
1858
|
+
ratio = window.devicePixelRatio;
|
|
1859
|
+
} else if (~ua.indexOf('msie')) {
|
|
1860
|
+
if (screen.deviceXDPI && screen.logicalXDPI) {
|
|
1861
|
+
ratio = screen.deviceXDPI / screen.logicalXDPI;
|
|
1862
|
+
}
|
|
1863
|
+
} else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
|
|
1864
|
+
ratio = window.outerWidth / window.innerWidth;
|
|
1865
|
+
}
|
|
1866
|
+
|
|
1867
|
+
if (ratio) {
|
|
1868
|
+
ratio = Math.round(ratio * 100);
|
|
1869
|
+
}
|
|
1870
|
+
|
|
1871
|
+
return ratio / 100;
|
|
1872
|
+
};
|
|
1819
1873
|
/**
|
|
1820
1874
|
* handlerUrl
|
|
1821
1875
|
* @desc:更新url参数中的时间戳
|
|
@@ -2558,32 +2612,53 @@ var rmbToCapital = function rmbToCapital(number) {
|
|
|
2558
2612
|
|
|
2559
2613
|
return result;
|
|
2560
2614
|
};
|
|
2561
|
-
|
|
2562
|
-
|
|
2563
|
-
|
|
2564
|
-
|
|
2565
|
-
|
|
2566
|
-
|
|
2567
|
-
|
|
2568
|
-
var
|
|
2569
|
-
|
|
2570
|
-
|
|
2571
|
-
|
|
2572
|
-
|
|
2573
|
-
|
|
2615
|
+
/**
|
|
2616
|
+
* setScale
|
|
2617
|
+
* @desc 设置缩放
|
|
2618
|
+
* @param {number} width - 分辨率宽度
|
|
2619
|
+
* @param {number} height - 分辨率高度
|
|
2620
|
+
**/
|
|
2621
|
+
var setScale = function setScale() {
|
|
2622
|
+
var width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1920;
|
|
2623
|
+
var height = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1080;
|
|
2624
|
+
|
|
2625
|
+
var n = 1;
|
|
2626
|
+
var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
|
|
2627
|
+
var zoom = getZoom();
|
|
2628
|
+
if (isMac) {
|
|
2629
|
+
n = 2;
|
|
2630
|
+
} else {
|
|
2631
|
+
n = 1;
|
|
2632
|
+
}
|
|
2633
|
+
if (zoom === 1) {
|
|
2634
|
+
document.body.style.removeProperty('transform');
|
|
2635
|
+
document.body.style.removeProperty('width');
|
|
2636
|
+
document.body.style.removeProperty('height');
|
|
2637
|
+
document.body.style.removeProperty('transform-origin');
|
|
2638
|
+
return;
|
|
2639
|
+
}
|
|
2640
|
+
if (Math.abs(parseInt(width - window.innerWidth * zoom / n, 10)) > 15 && window.innerWidth * zoom / n !== width) {
|
|
2641
|
+
var scale = 'scale(' + window.innerWidth * zoom / width / zoom + ',' + window.innerHeight * zoom / height / zoom + ')';
|
|
2642
|
+
document.body.style.transform = scale;
|
|
2643
|
+
document.body.style.width = width + 'px';
|
|
2644
|
+
document.body.style.height = height + 'px';
|
|
2645
|
+
document.body.style.transformOrigin = '0 0';
|
|
2646
|
+
} else {
|
|
2647
|
+
if (isMac) {
|
|
2648
|
+
var _scale = 'scale(' + 1 * n / zoom + ')';
|
|
2649
|
+
document.body.style.transform = _scale;
|
|
2650
|
+
document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
|
|
2651
|
+
document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
|
|
2652
|
+
document.body.style.transformOrigin = '0 0';
|
|
2574
2653
|
} else {
|
|
2575
|
-
|
|
2576
|
-
|
|
2577
|
-
|
|
2578
|
-
|
|
2654
|
+
var _scale2 = 'scale(' + 1 * n / zoom + ')';
|
|
2655
|
+
document.body.style.transform = _scale2;
|
|
2656
|
+
document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
|
|
2657
|
+
document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
|
|
2658
|
+
document.body.style.transformOrigin = '0 0';
|
|
2579
2659
|
}
|
|
2580
|
-
chunk = Math.floor(chunk / 10);
|
|
2581
|
-
digitIndex++;
|
|
2582
2660
|
}
|
|
2583
|
-
|
|
2584
|
-
return result;
|
|
2585
|
-
}
|
|
2586
|
-
|
|
2661
|
+
};
|
|
2587
2662
|
/**
|
|
2588
2663
|
* sendMessage
|
|
2589
2664
|
* @desc:向iframe发送信息
|
|
@@ -3119,6 +3194,7 @@ var watermark = function watermark(option) {
|
|
|
3119
3194
|
rmbToCapital: rmbToCapital,
|
|
3120
3195
|
sendMessage: sendMessage,
|
|
3121
3196
|
setFavicon: setFavicon,
|
|
3197
|
+
setScale: setScale,
|
|
3122
3198
|
setStorage: setStorage,
|
|
3123
3199
|
socket: socket,
|
|
3124
3200
|
startWith: startWith,
|
|
@@ -3690,6 +3766,8 @@ var WebSocket = function () {
|
|
|
3690
3766
|
this.connects = 1;
|
|
3691
3767
|
this.recon = false;
|
|
3692
3768
|
this.sendTimeout = null;
|
|
3769
|
+
this.socket = null;
|
|
3770
|
+
this.subscription = null;
|
|
3693
3771
|
}
|
|
3694
3772
|
|
|
3695
3773
|
/** socket连接 */
|
|
@@ -3700,14 +3778,12 @@ var WebSocket = function () {
|
|
|
3700
3778
|
|
|
3701
3779
|
if (!this.client) {
|
|
3702
3780
|
// 连接SockJS
|
|
3703
|
-
|
|
3704
|
-
|
|
3705
|
-
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
|
|
3781
|
+
this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
|
|
3782
|
+
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
|
|
3706
3783
|
}
|
|
3707
3784
|
|
|
3708
3785
|
// 日志不打印
|
|
3709
3786
|
if (!this.debug) {
|
|
3710
|
-
console.log(111);
|
|
3711
3787
|
this.client.debug = function () {};
|
|
3712
3788
|
}
|
|
3713
3789
|
|
|
@@ -3719,9 +3795,10 @@ var WebSocket = function () {
|
|
|
3719
3795
|
// 订阅消息
|
|
3720
3796
|
_this.subscribe();
|
|
3721
3797
|
}, function (error) {
|
|
3798
|
+
_this.unsubscribe();
|
|
3799
|
+
_this.client = null;
|
|
3722
3800
|
var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
|
|
3723
3801
|
if (_this.connects > 5 && diffSecond < _this.interval) {
|
|
3724
|
-
_this.client.disconnect();
|
|
3725
3802
|
_this.error && _this.error(error);
|
|
3726
3803
|
} else {
|
|
3727
3804
|
_this.reconTimeout = setTimeout(function () {
|
|
@@ -3730,6 +3807,14 @@ var WebSocket = function () {
|
|
|
3730
3807
|
}, 5000);
|
|
3731
3808
|
}
|
|
3732
3809
|
});
|
|
3810
|
+
}; // 清除订阅
|
|
3811
|
+
|
|
3812
|
+
|
|
3813
|
+
WebSocket.prototype.unsubscribe = function unsubscribe() {
|
|
3814
|
+
if (this.subscription) {
|
|
3815
|
+
this.subscription.unsubscribe();
|
|
3816
|
+
this.subscription = null;
|
|
3817
|
+
}
|
|
3733
3818
|
};
|
|
3734
3819
|
/** 订阅服务端 */
|
|
3735
3820
|
|
|
@@ -3738,7 +3823,7 @@ var WebSocket = function () {
|
|
|
3738
3823
|
var _this2 = this;
|
|
3739
3824
|
|
|
3740
3825
|
// 订阅服务端提供的某个topic
|
|
3741
|
-
this.client.subscribe(this.take, function (response) {
|
|
3826
|
+
this.subscription = this.client.subscribe(this.take, function (response) {
|
|
3742
3827
|
if (response && (_this2.callback || _this2.success)) {
|
|
3743
3828
|
var callback = _this2.callback || _this2.success;
|
|
3744
3829
|
callback(JSON.parse(response.body));
|
|
@@ -3779,6 +3864,7 @@ var WebSocket = function () {
|
|
|
3779
3864
|
|
|
3780
3865
|
WebSocket.prototype.destroy = function destroy() {
|
|
3781
3866
|
// 断开连接,清除定时器
|
|
3867
|
+
this.unsubscribe();
|
|
3782
3868
|
if (this.client) {
|
|
3783
3869
|
this.client.disconnect();
|
|
3784
3870
|
};
|
|
@@ -3814,6 +3900,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3814
3900
|
|
|
3815
3901
|
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
|
|
3816
3902
|
|
|
3903
|
+
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
|
|
3904
|
+
|
|
3817
3905
|
|
|
3818
3906
|
|
|
3819
3907
|
|
|
@@ -4046,26 +4134,34 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
|
|
|
4046
4134
|
}, [content]);
|
|
4047
4135
|
}
|
|
4048
4136
|
}
|
|
4137
|
+
|
|
4138
|
+
var _$attrs = this.$attrs,
|
|
4139
|
+
prefix = _$attrs.prefix,
|
|
4140
|
+
suffix = _$attrs.suffix,
|
|
4141
|
+
prepend = _$attrs.prepend,
|
|
4142
|
+
append = _$attrs.append,
|
|
4143
|
+
attrs = _objectWithoutProperties(_$attrs, ['prefix', 'suffix', 'prepend', 'append']);
|
|
4144
|
+
|
|
4049
4145
|
if (this.$slots.prefix) {
|
|
4050
4146
|
doms.push(h('template', { slot: 'prefix' }, this.$slots.prefix));
|
|
4051
|
-
} else if (
|
|
4147
|
+
} else if (prefix) {
|
|
4052
4148
|
this.renderd(doms, h, 'prefix');
|
|
4053
4149
|
cls.push('es-input-button-prefix');
|
|
4054
4150
|
}
|
|
4055
4151
|
if (this.$slots.suffix) {
|
|
4056
4152
|
doms.push(h('template', { slot: 'suffix' }, this.$slots.suffix));
|
|
4057
|
-
} else if (
|
|
4153
|
+
} else if (suffix) {
|
|
4058
4154
|
this.renderd(doms, h, 'suffix');
|
|
4059
4155
|
cls.push('es-input-button-suffix');
|
|
4060
4156
|
}
|
|
4061
4157
|
if (this.$slots.prepend) {
|
|
4062
4158
|
doms.push(h('template', { slot: 'prepend' }, this.$slots.prepend));
|
|
4063
|
-
} else if (
|
|
4159
|
+
} else if (prepend) {
|
|
4064
4160
|
this.renderd(doms, h, 'prepend');
|
|
4065
4161
|
}
|
|
4066
4162
|
if (this.$slots.append) {
|
|
4067
4163
|
doms.push(h('template', { slot: 'append' }, this.$slots.append));
|
|
4068
|
-
} else if (
|
|
4164
|
+
} else if (append) {
|
|
4069
4165
|
this.renderd(doms, h, 'append');
|
|
4070
4166
|
}
|
|
4071
4167
|
if (this.fetchSuggestions || this.url || this.data.length > 0) {
|
|
@@ -4074,7 +4170,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
|
|
|
4074
4170
|
props: {
|
|
4075
4171
|
rules: this.rule
|
|
4076
4172
|
},
|
|
4077
|
-
attrs: _extends({},
|
|
4173
|
+
attrs: _extends({}, attrs, {
|
|
4078
4174
|
fetchSuggestions: this.fetchSuggestions ? this.fetchSuggestions : this.getData,
|
|
4079
4175
|
triggerOnFocus: this.focusShow,
|
|
4080
4176
|
value: this.model
|
|
@@ -4092,7 +4188,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
|
|
|
4092
4188
|
domProps: {
|
|
4093
4189
|
value: this.model
|
|
4094
4190
|
},
|
|
4095
|
-
attrs: _extends({},
|
|
4191
|
+
attrs: _extends({}, attrs),
|
|
4096
4192
|
on: _extends({}, this.$listeners),
|
|
4097
4193
|
directives: [{
|
|
4098
4194
|
name: 'show',
|