eoss-ui 0.5.56 → 0.5.59
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 +69 -18
- package/lib/button.js +43 -4
- package/lib/cascader.js +2 -2
- package/lib/checkbox-group.js +41 -2
- package/lib/data-table-form.js +41 -2
- package/lib/data-table.js +71 -19
- package/lib/date-picker.js +43 -4
- package/lib/dialog.js +41 -2
- package/lib/eoss-ui.common.js +253 -98
- package/lib/flow-group.js +41 -2
- package/lib/flow-list.js +41 -2
- package/lib/flow.js +44 -6
- package/lib/form.js +41 -2
- package/lib/handle-user.js +41 -2
- package/lib/handler.js +41 -2
- package/lib/icon.js +3880 -0
- package/lib/icons.js +2 -2
- package/lib/index.js +1 -1
- package/lib/input-number.js +43 -4
- package/lib/input.js +43 -4
- package/lib/label.js +2 -2
- package/lib/login.js +47 -8
- package/lib/main.js +43 -5
- package/lib/menu.js +2 -3
- package/lib/nav.js +43 -4
- package/lib/notify.js +2 -2
- package/lib/page.js +43 -4
- package/lib/pagination.js +2 -2
- package/lib/player.js +43 -4
- package/lib/qr-code.js +43 -4
- package/lib/radio-group.js +43 -4
- package/lib/retrial-auth.js +43 -4
- package/lib/select-ganged.js +43 -4
- package/lib/select.js +43 -4
- package/lib/selector-panel.js +41 -2
- package/lib/selector.js +50 -11
- package/lib/sizer.js +43 -4
- package/lib/steps.js +43 -4
- package/lib/switch.js +50 -11
- package/lib/table-form.js +43 -4
- package/lib/tabs-panel.js +2 -2
- package/lib/tabs.js +43 -4
- package/lib/theme-chalk/data-table.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/menu.css +1 -1
- package/lib/tips.js +43 -4
- package/lib/toolbar.js +2 -3
- package/lib/tree-group.js +43 -4
- package/lib/tree.js +49 -8
- package/lib/upload.js +46 -8
- package/lib/utils/util.js +41 -2
- package/lib/wujie.js +43 -4
- package/lib/wxlogin.js +176 -137
- package/package.json +1 -1
- package/packages/button-group/src/main.vue +21 -16
- package/packages/data-table/src/column.vue +1 -1
- package/packages/data-table/src/main.vue +14 -4
- package/packages/flow/src/main.vue +1 -2
- package/packages/icon/index.js +5 -0
- package/packages/icon/src/main.vue +43 -0
- package/packages/login/src/main.vue +6 -4
- package/packages/main/src/main.vue +0 -1
- package/packages/menu/src/main.vue +0 -1
- package/packages/theme-chalk/lib/data-table.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/menu.css +1 -1
- package/packages/theme-chalk/src/data-table.scss +17 -0
- package/packages/theme-chalk/src/menu.scss +3 -5
- package/packages/toolbar/src/main.vue +0 -1
- package/packages/tree/src/main.vue +14 -2
- package/packages/upload/src/main.vue +0 -1
- package/src/index.js +4 -1
- package/src/utils/util.js +39 -1
package/lib/wxlogin.js
CHANGED
|
@@ -82,7 +82,7 @@ module.exports =
|
|
|
82
82
|
/******/
|
|
83
83
|
/******/
|
|
84
84
|
/******/ // Load entry module and return exports
|
|
85
|
-
/******/ return __webpack_require__(__webpack_require__.s =
|
|
85
|
+
/******/ return __webpack_require__(__webpack_require__.s = 70);
|
|
86
86
|
/******/ })
|
|
87
87
|
/************************************************************************/
|
|
88
88
|
/******/ ({
|
|
@@ -1974,7 +1974,45 @@ var indexOfObj = function indexOfObj(arry, target, key) {
|
|
|
1974
1974
|
}
|
|
1975
1975
|
return -1;
|
|
1976
1976
|
};
|
|
1977
|
+
/**
|
|
1978
|
+
* isEmpty
|
|
1979
|
+
* @desc:判断是否为空
|
|
1980
|
+
* @author huangbo
|
|
1981
|
+
* @date 2022年5月7日
|
|
1982
|
+
* @param {Object} [obj] -
|
|
1983
|
+
**/
|
|
1984
|
+
var isEmpty = function isEmpty(val) {
|
|
1985
|
+
// null or undefined
|
|
1986
|
+
if (val === null || val === undefined) return true;
|
|
1987
|
+
|
|
1988
|
+
if (typeof val === 'boolean') return false;
|
|
1989
|
+
|
|
1990
|
+
if (typeof val === 'number') return !val;
|
|
1991
|
+
|
|
1992
|
+
if (val instanceof Error) return val.message === '';
|
|
1993
|
+
|
|
1994
|
+
switch (Object.prototype.toString.call(val)) {
|
|
1995
|
+
// String or Array
|
|
1996
|
+
case '[object String]':
|
|
1997
|
+
case '[object Array]':
|
|
1998
|
+
return !val.length;
|
|
1977
1999
|
|
|
2000
|
+
// Map or Set or File
|
|
2001
|
+
case '[object File]':
|
|
2002
|
+
case '[object Map]':
|
|
2003
|
+
case '[object Set]':
|
|
2004
|
+
{
|
|
2005
|
+
return !val.size;
|
|
2006
|
+
}
|
|
2007
|
+
// Plain Object
|
|
2008
|
+
case '[object Object]':
|
|
2009
|
+
{
|
|
2010
|
+
return !Object.keys(val).length;
|
|
2011
|
+
}
|
|
2012
|
+
}
|
|
2013
|
+
|
|
2014
|
+
return false;
|
|
2015
|
+
};
|
|
1978
2016
|
/**
|
|
1979
2017
|
* isExist
|
|
1980
2018
|
* @desc:判断是否存在
|
|
@@ -2005,7 +2043,7 @@ var isFunction = function isFunction(obj) {
|
|
|
2005
2043
|
* @param {object} [to] - 路由跳转信息
|
|
2006
2044
|
* @param {object} [from] - 路由来源信息
|
|
2007
2045
|
* @param {function} [next] - 跳转函数
|
|
2008
|
-
* @param {array} [exclude] - 不拦截的路由
|
|
2046
|
+
* @param {array/boolean} [exclude] - 不拦截的路由
|
|
2009
2047
|
* @param {boolean} [open] - 是否新窗口打开
|
|
2010
2048
|
* @param {boolean} [cookie] - 是否尝试采用
|
|
2011
2049
|
* @param {sting} [loginPage] - 第三方登录页面地址
|
|
@@ -2158,7 +2196,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2158
2196
|
});
|
|
2159
2197
|
}
|
|
2160
2198
|
}).catch(function (e) {});
|
|
2161
|
-
} else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2199
|
+
} else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
|
|
2162
2200
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2163
2201
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2164
2202
|
} else {
|
|
@@ -3055,6 +3093,7 @@ var watermark = function watermark(option) {
|
|
|
3055
3093
|
hsvTorgb: hsvTorgb,
|
|
3056
3094
|
identical: identical,
|
|
3057
3095
|
indexOfObj: indexOfObj,
|
|
3096
|
+
isEmpty: isEmpty,
|
|
3058
3097
|
isExist: isExist,
|
|
3059
3098
|
isFunction: isFunction,
|
|
3060
3099
|
isLogged: isLogged,
|
|
@@ -3583,7 +3622,140 @@ module.exports = require("json-bigint");
|
|
|
3583
3622
|
|
|
3584
3623
|
/***/ }),
|
|
3585
3624
|
|
|
3586
|
-
/***/
|
|
3625
|
+
/***/ 7:
|
|
3626
|
+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
3627
|
+
|
|
3628
|
+
"use strict";
|
|
3629
|
+
/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
|
|
3630
|
+
/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
|
|
3631
|
+
/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
|
|
3632
|
+
/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
|
|
3633
|
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
3634
|
+
|
|
3635
|
+
|
|
3636
|
+
|
|
3637
|
+
|
|
3638
|
+
var WebSocket = function () {
|
|
3639
|
+
// 构造函数
|
|
3640
|
+
function WebSocket() {
|
|
3641
|
+
_classCallCheck(this, WebSocket);
|
|
3642
|
+
|
|
3643
|
+
this.host = sessionStorage.getItem('wshost') || '';
|
|
3644
|
+
this.tryTimes = 1; // 重连次数
|
|
3645
|
+
this.callback = null; // 回调函数
|
|
3646
|
+
this.client = null; // stomp对象
|
|
3647
|
+
this.reconTimeout = null; // 重连延时器
|
|
3648
|
+
this.debug = true; // 调试
|
|
3649
|
+
this.interval = 20; // 重连间隔时间
|
|
3650
|
+
this.vm = null;
|
|
3651
|
+
this.nextDate = 0;
|
|
3652
|
+
this.connects = 1;
|
|
3653
|
+
this.recon = false;
|
|
3654
|
+
this.sendTimeout = null;
|
|
3655
|
+
}
|
|
3656
|
+
|
|
3657
|
+
/** socket连接 */
|
|
3658
|
+
|
|
3659
|
+
|
|
3660
|
+
WebSocket.prototype.connect = function connect() {
|
|
3661
|
+
var _this = this;
|
|
3662
|
+
|
|
3663
|
+
if (!this.client) {
|
|
3664
|
+
// 连接SockJS
|
|
3665
|
+
var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
|
|
3666
|
+
// 获取STOMP子协议的客户端对象
|
|
3667
|
+
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
|
|
3668
|
+
}
|
|
3669
|
+
|
|
3670
|
+
// 日志不打印
|
|
3671
|
+
if (!this.debug) {
|
|
3672
|
+
console.log(111);
|
|
3673
|
+
this.client.debug = function () {};
|
|
3674
|
+
}
|
|
3675
|
+
|
|
3676
|
+
// 向服务器发起websocket连接
|
|
3677
|
+
this.client.connect({}, function () {
|
|
3678
|
+
_this.recon = true;
|
|
3679
|
+
// tryTimes定义重置
|
|
3680
|
+
_this.connects = 1;
|
|
3681
|
+
// 订阅消息
|
|
3682
|
+
_this.subscribe();
|
|
3683
|
+
}, function (error) {
|
|
3684
|
+
var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
|
|
3685
|
+
if (_this.connects > 5 && diffSecond < _this.interval) {
|
|
3686
|
+
_this.client.disconnect();
|
|
3687
|
+
_this.error && _this.error(error);
|
|
3688
|
+
} else {
|
|
3689
|
+
_this.reconTimeout = setTimeout(function () {
|
|
3690
|
+
_this.connect();
|
|
3691
|
+
_this.connects++;
|
|
3692
|
+
}, 5000);
|
|
3693
|
+
}
|
|
3694
|
+
});
|
|
3695
|
+
};
|
|
3696
|
+
/** 订阅服务端 */
|
|
3697
|
+
|
|
3698
|
+
|
|
3699
|
+
WebSocket.prototype.subscribe = function subscribe() {
|
|
3700
|
+
var _this2 = this;
|
|
3701
|
+
|
|
3702
|
+
// 订阅服务端提供的某个topic
|
|
3703
|
+
this.client.subscribe(this.take, function (response) {
|
|
3704
|
+
if (response && (_this2.callback || _this2.success)) {
|
|
3705
|
+
var callback = _this2.callback || _this2.success;
|
|
3706
|
+
callback(JSON.parse(response.body));
|
|
3707
|
+
}
|
|
3708
|
+
});
|
|
3709
|
+
};
|
|
3710
|
+
|
|
3711
|
+
/** 赋值、初始化socket */
|
|
3712
|
+
|
|
3713
|
+
|
|
3714
|
+
WebSocket.prototype.init = function init(option, vm) {
|
|
3715
|
+
for (var i in option) {
|
|
3716
|
+
this[i] = option[i];
|
|
3717
|
+
}
|
|
3718
|
+
this.vm = vm;
|
|
3719
|
+
// 初始化连接
|
|
3720
|
+
this.connect();
|
|
3721
|
+
};
|
|
3722
|
+
|
|
3723
|
+
/** 发送消息 */
|
|
3724
|
+
|
|
3725
|
+
|
|
3726
|
+
WebSocket.prototype.send = function send(data) {
|
|
3727
|
+
var _this3 = this;
|
|
3728
|
+
|
|
3729
|
+
if (this.recon) {
|
|
3730
|
+
clearTimeout(this.sendTimeout);
|
|
3731
|
+
this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
|
|
3732
|
+
} else {
|
|
3733
|
+
this.sendTimeout = setTimeout(function () {
|
|
3734
|
+
_this3.send(data);
|
|
3735
|
+
}, 1000);
|
|
3736
|
+
}
|
|
3737
|
+
};
|
|
3738
|
+
|
|
3739
|
+
/** 销毁 */
|
|
3740
|
+
|
|
3741
|
+
|
|
3742
|
+
WebSocket.prototype.destroy = function destroy() {
|
|
3743
|
+
// 断开连接,清除定时器
|
|
3744
|
+
if (this.client) {
|
|
3745
|
+
this.client.disconnect();
|
|
3746
|
+
};
|
|
3747
|
+
this.reconTimeout && clearTimeout(this.reconTimeout);
|
|
3748
|
+
this.sendTimeout && clearTimeout(this.sendTimeout);
|
|
3749
|
+
};
|
|
3750
|
+
|
|
3751
|
+
return WebSocket;
|
|
3752
|
+
}();
|
|
3753
|
+
|
|
3754
|
+
/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
|
|
3755
|
+
|
|
3756
|
+
/***/ }),
|
|
3757
|
+
|
|
3758
|
+
/***/ 70:
|
|
3587
3759
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
3588
3760
|
|
|
3589
3761
|
"use strict";
|
|
@@ -3772,139 +3944,6 @@ main.install = function (Vue) {
|
|
|
3772
3944
|
|
|
3773
3945
|
/***/ }),
|
|
3774
3946
|
|
|
3775
|
-
/***/ 7:
|
|
3776
|
-
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
3777
|
-
|
|
3778
|
-
"use strict";
|
|
3779
|
-
/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
|
|
3780
|
-
/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
|
|
3781
|
-
/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
|
|
3782
|
-
/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
|
|
3783
|
-
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
3784
|
-
|
|
3785
|
-
|
|
3786
|
-
|
|
3787
|
-
|
|
3788
|
-
var WebSocket = function () {
|
|
3789
|
-
// 构造函数
|
|
3790
|
-
function WebSocket() {
|
|
3791
|
-
_classCallCheck(this, WebSocket);
|
|
3792
|
-
|
|
3793
|
-
this.host = sessionStorage.getItem('wshost') || '';
|
|
3794
|
-
this.tryTimes = 1; // 重连次数
|
|
3795
|
-
this.callback = null; // 回调函数
|
|
3796
|
-
this.client = null; // stomp对象
|
|
3797
|
-
this.reconTimeout = null; // 重连延时器
|
|
3798
|
-
this.debug = true; // 调试
|
|
3799
|
-
this.interval = 20; // 重连间隔时间
|
|
3800
|
-
this.vm = null;
|
|
3801
|
-
this.nextDate = 0;
|
|
3802
|
-
this.connects = 1;
|
|
3803
|
-
this.recon = false;
|
|
3804
|
-
this.sendTimeout = null;
|
|
3805
|
-
}
|
|
3806
|
-
|
|
3807
|
-
/** socket连接 */
|
|
3808
|
-
|
|
3809
|
-
|
|
3810
|
-
WebSocket.prototype.connect = function connect() {
|
|
3811
|
-
var _this = this;
|
|
3812
|
-
|
|
3813
|
-
if (!this.client) {
|
|
3814
|
-
// 连接SockJS
|
|
3815
|
-
var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
|
|
3816
|
-
// 获取STOMP子协议的客户端对象
|
|
3817
|
-
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
|
|
3818
|
-
}
|
|
3819
|
-
|
|
3820
|
-
// 日志不打印
|
|
3821
|
-
if (!this.debug) {
|
|
3822
|
-
console.log(111);
|
|
3823
|
-
this.client.debug = function () {};
|
|
3824
|
-
}
|
|
3825
|
-
|
|
3826
|
-
// 向服务器发起websocket连接
|
|
3827
|
-
this.client.connect({}, function () {
|
|
3828
|
-
_this.recon = true;
|
|
3829
|
-
// tryTimes定义重置
|
|
3830
|
-
_this.connects = 1;
|
|
3831
|
-
// 订阅消息
|
|
3832
|
-
_this.subscribe();
|
|
3833
|
-
}, function (error) {
|
|
3834
|
-
var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
|
|
3835
|
-
if (_this.connects > 5 && diffSecond < _this.interval) {
|
|
3836
|
-
_this.client.disconnect();
|
|
3837
|
-
_this.error && _this.error(error);
|
|
3838
|
-
} else {
|
|
3839
|
-
_this.reconTimeout = setTimeout(function () {
|
|
3840
|
-
_this.connect();
|
|
3841
|
-
_this.connects++;
|
|
3842
|
-
}, 5000);
|
|
3843
|
-
}
|
|
3844
|
-
});
|
|
3845
|
-
};
|
|
3846
|
-
/** 订阅服务端 */
|
|
3847
|
-
|
|
3848
|
-
|
|
3849
|
-
WebSocket.prototype.subscribe = function subscribe() {
|
|
3850
|
-
var _this2 = this;
|
|
3851
|
-
|
|
3852
|
-
// 订阅服务端提供的某个topic
|
|
3853
|
-
this.client.subscribe(this.take, function (response) {
|
|
3854
|
-
if (response && (_this2.callback || _this2.success)) {
|
|
3855
|
-
var callback = _this2.callback || _this2.success;
|
|
3856
|
-
callback(JSON.parse(response.body));
|
|
3857
|
-
}
|
|
3858
|
-
});
|
|
3859
|
-
};
|
|
3860
|
-
|
|
3861
|
-
/** 赋值、初始化socket */
|
|
3862
|
-
|
|
3863
|
-
|
|
3864
|
-
WebSocket.prototype.init = function init(option, vm) {
|
|
3865
|
-
for (var i in option) {
|
|
3866
|
-
this[i] = option[i];
|
|
3867
|
-
}
|
|
3868
|
-
this.vm = vm;
|
|
3869
|
-
// 初始化连接
|
|
3870
|
-
this.connect();
|
|
3871
|
-
};
|
|
3872
|
-
|
|
3873
|
-
/** 发送消息 */
|
|
3874
|
-
|
|
3875
|
-
|
|
3876
|
-
WebSocket.prototype.send = function send(data) {
|
|
3877
|
-
var _this3 = this;
|
|
3878
|
-
|
|
3879
|
-
if (this.recon) {
|
|
3880
|
-
clearTimeout(this.sendTimeout);
|
|
3881
|
-
this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
|
|
3882
|
-
} else {
|
|
3883
|
-
this.sendTimeout = setTimeout(function () {
|
|
3884
|
-
_this3.send(data);
|
|
3885
|
-
}, 1000);
|
|
3886
|
-
}
|
|
3887
|
-
};
|
|
3888
|
-
|
|
3889
|
-
/** 销毁 */
|
|
3890
|
-
|
|
3891
|
-
|
|
3892
|
-
WebSocket.prototype.destroy = function destroy() {
|
|
3893
|
-
// 断开连接,清除定时器
|
|
3894
|
-
if (this.client) {
|
|
3895
|
-
this.client.disconnect();
|
|
3896
|
-
};
|
|
3897
|
-
this.reconTimeout && clearTimeout(this.reconTimeout);
|
|
3898
|
-
this.sendTimeout && clearTimeout(this.sendTimeout);
|
|
3899
|
-
};
|
|
3900
|
-
|
|
3901
|
-
return WebSocket;
|
|
3902
|
-
}();
|
|
3903
|
-
|
|
3904
|
-
/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
|
|
3905
|
-
|
|
3906
|
-
/***/ }),
|
|
3907
|
-
|
|
3908
3947
|
/***/ 8:
|
|
3909
3948
|
/***/ (function(module, exports) {
|
|
3910
3949
|
|
package/package.json
CHANGED
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
:key="index"
|
|
9
9
|
:size="size"
|
|
10
10
|
:type="item.type"
|
|
11
|
-
@click="handleClick({
|
|
11
|
+
@click="handleClick({ ...data, handle: item })"
|
|
12
12
|
>
|
|
13
13
|
{{
|
|
14
|
-
item.template ? item.template({
|
|
14
|
+
item.template ? item.template({ ...data, config: item }) : item.text
|
|
15
15
|
}}
|
|
16
16
|
</es-button>
|
|
17
17
|
<el-dropdown
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
<i :class="item.icon" v-if="item.icon"></i
|
|
32
32
|
>{{
|
|
33
33
|
item.template
|
|
34
|
-
? item.template({
|
|
34
|
+
? item.template({ ...data, config: item })
|
|
35
35
|
: item.text
|
|
36
36
|
}}</el-dropdown-item
|
|
37
37
|
>
|
|
@@ -62,7 +62,8 @@ export default {
|
|
|
62
62
|
trigger: {
|
|
63
63
|
type: String,
|
|
64
64
|
default: 'click'
|
|
65
|
-
}
|
|
65
|
+
},
|
|
66
|
+
useCaseCodeKey: String
|
|
66
67
|
},
|
|
67
68
|
computed: {
|
|
68
69
|
btns() {
|
|
@@ -86,27 +87,31 @@ export default {
|
|
|
86
87
|
methods: {
|
|
87
88
|
getBtns() {
|
|
88
89
|
let useCaseCodes = util.getStorage('useCaseCodes');
|
|
90
|
+
let keyword =
|
|
91
|
+
this.data && this.useCaseCodeKey
|
|
92
|
+
? this.data.row[this.useCaseCodeKey]
|
|
93
|
+
: null;
|
|
89
94
|
let arry = this.contents.filter((item) => {
|
|
90
95
|
if (Object.prototype.hasOwnProperty.call(item, 'rules')) {
|
|
91
|
-
if (useCaseCodes && item.useCaseCode) {
|
|
96
|
+
if (useCaseCodes && (item.useCaseCode || keyword)) {
|
|
92
97
|
return (
|
|
93
|
-
item.rules(this.data) &&
|
|
94
|
-
useCaseCodes.indexOf(item.useCaseCode) > -1
|
|
98
|
+
item.rules(this.data.row) &&
|
|
99
|
+
useCaseCodes.indexOf(item.useCaseCode || keyword) > -1
|
|
95
100
|
);
|
|
96
101
|
}
|
|
97
|
-
return item.rules(this.data);
|
|
102
|
+
return item.rules(this.data.row);
|
|
98
103
|
}
|
|
99
104
|
if (this.rules !== undefined) {
|
|
100
|
-
if (useCaseCodes && item.useCaseCode) {
|
|
105
|
+
if (useCaseCodes && (item.useCaseCode || keyword)) {
|
|
101
106
|
return (
|
|
102
|
-
this.rules(this.data) &&
|
|
103
|
-
useCaseCodes.indexOf(item.useCaseCode) > -1
|
|
107
|
+
this.rules(this.data.row) &&
|
|
108
|
+
useCaseCodes.indexOf(item.useCaseCode || keyword) > -1
|
|
104
109
|
);
|
|
105
110
|
}
|
|
106
|
-
return this.rules(this.data);
|
|
111
|
+
return this.rules(this.data.row);
|
|
107
112
|
}
|
|
108
|
-
if (useCaseCodes && item.useCaseCode) {
|
|
109
|
-
return useCaseCodes.indexOf(item.useCaseCode) > -1;
|
|
113
|
+
if (useCaseCodes && (item.useCaseCode || keyword)) {
|
|
114
|
+
return useCaseCodes.indexOf(item.useCaseCode || keyword) > -1;
|
|
110
115
|
}
|
|
111
116
|
return true;
|
|
112
117
|
});
|
|
@@ -117,8 +122,8 @@ export default {
|
|
|
117
122
|
this.$emit('handle-click', obj);
|
|
118
123
|
},
|
|
119
124
|
handleCommand(res) {
|
|
120
|
-
this.$emit('handleClick', {
|
|
121
|
-
this.$emit('handle-click', {
|
|
125
|
+
this.$emit('handleClick', { ...this.data, handle: res });
|
|
126
|
+
this.$emit('handle-click', { ...this.data, handle: res });
|
|
122
127
|
},
|
|
123
128
|
resetWidth() {
|
|
124
129
|
this.$nextTick(() => {
|
|
@@ -34,6 +34,7 @@
|
|
|
34
34
|
<div
|
|
35
35
|
style="styles"
|
|
36
36
|
class="es-data-table-content"
|
|
37
|
+
:class="border == 'none' ? 'es-table-border-none' : ''"
|
|
37
38
|
ref="esTableContent"
|
|
38
39
|
v-if="show"
|
|
39
40
|
>
|
|
@@ -50,7 +51,7 @@
|
|
|
50
51
|
tableHeight !== 'auto' && tableHeight !== false
|
|
51
52
|
? tableHeight
|
|
52
53
|
: undefined,
|
|
53
|
-
border:
|
|
54
|
+
border: _border,
|
|
54
55
|
infiniteScroll: getTableData,
|
|
55
56
|
infiniteScrollDisabled: infiniteDisabled
|
|
56
57
|
}"
|
|
@@ -61,7 +62,10 @@
|
|
|
61
62
|
'filter-column': handleFilterColumn,
|
|
62
63
|
'sort-change': handleSortChange
|
|
63
64
|
}"
|
|
64
|
-
:class="
|
|
65
|
+
:class="
|
|
66
|
+
'es-table' +
|
|
67
|
+
(theadBorder && border != 'none' ? ' es-thead-border' : '')
|
|
68
|
+
"
|
|
65
69
|
>
|
|
66
70
|
<slot name="prepend"></slot>
|
|
67
71
|
<slot></slot>
|
|
@@ -347,8 +351,11 @@ export default {
|
|
|
347
351
|
response: Function,
|
|
348
352
|
minWidth: [Number, String],
|
|
349
353
|
border: {
|
|
350
|
-
type: Boolean,
|
|
351
|
-
default: false
|
|
354
|
+
type: [Boolean, String],
|
|
355
|
+
default: false,
|
|
356
|
+
validator: function (value) {
|
|
357
|
+
return [true, false, 'none'].includes(value);
|
|
358
|
+
}
|
|
352
359
|
},
|
|
353
360
|
theadBorder: {
|
|
354
361
|
type: Boolean,
|
|
@@ -435,6 +442,9 @@ export default {
|
|
|
435
442
|
tag() {
|
|
436
443
|
return this.form && this.elForm == '' ? 'el-form' : 'div';
|
|
437
444
|
},
|
|
445
|
+
_border() {
|
|
446
|
+
return this.border === true ? true : false;
|
|
447
|
+
},
|
|
438
448
|
theads: {
|
|
439
449
|
get() {
|
|
440
450
|
let thead = [];
|
|
@@ -1335,9 +1335,8 @@ export default {
|
|
|
1335
1335
|
if(!this.$refs.commonOpinions.validate()) return
|
|
1336
1336
|
}
|
|
1337
1337
|
if (this.beforeSubmit != undefined) {
|
|
1338
|
-
this.beforeSubmit()
|
|
1338
|
+
this.beforeSubmit(0)
|
|
1339
1339
|
.then((next) => {
|
|
1340
|
-
|
|
1341
1340
|
this.showReject = true;
|
|
1342
1341
|
})
|
|
1343
1342
|
.catch((e) => {});
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<i :class="className">
|
|
3
|
+
<slot>{{ code }}</slot>
|
|
4
|
+
</i>
|
|
5
|
+
</template>
|
|
6
|
+
<script>
|
|
7
|
+
import util from 'eoss-ui/src/utils/util';
|
|
8
|
+
export default {
|
|
9
|
+
name: 'EsIcon',
|
|
10
|
+
inheritAttrs: false,
|
|
11
|
+
props: {
|
|
12
|
+
contents: [Object, String]
|
|
13
|
+
},
|
|
14
|
+
watch: {
|
|
15
|
+
contents: {
|
|
16
|
+
immediate: true,
|
|
17
|
+
deep: true,
|
|
18
|
+
handler(val) {
|
|
19
|
+
if (val) {
|
|
20
|
+
if (typeof val == 'string') {
|
|
21
|
+
if (util.startWith(val, '&#')) {
|
|
22
|
+
this.code = val;
|
|
23
|
+
} else {
|
|
24
|
+
this.className = val;
|
|
25
|
+
}
|
|
26
|
+
} else {
|
|
27
|
+
this.code = val.code;
|
|
28
|
+
this.className = val.className;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
data() {
|
|
35
|
+
return {
|
|
36
|
+
code: '',
|
|
37
|
+
className: ''
|
|
38
|
+
};
|
|
39
|
+
},
|
|
40
|
+
created() {},
|
|
41
|
+
methods: {}
|
|
42
|
+
};
|
|
43
|
+
</script>
|
|
@@ -410,10 +410,10 @@ export default {
|
|
|
410
410
|
return {
|
|
411
411
|
placeholder: '请输入手机号',
|
|
412
412
|
rules: [
|
|
413
|
-
{ required: true, message: '手机号不能为空', trigger: '
|
|
413
|
+
{ required: true, message: '手机号不能为空', trigger: 'change' },
|
|
414
414
|
{
|
|
415
415
|
...rules.phone,
|
|
416
|
-
trigger: '
|
|
416
|
+
trigger: 'change'
|
|
417
417
|
}
|
|
418
418
|
]
|
|
419
419
|
};
|
|
@@ -428,7 +428,7 @@ export default {
|
|
|
428
428
|
{
|
|
429
429
|
required: true,
|
|
430
430
|
message: '请输入邮箱地址',
|
|
431
|
-
trigger: '
|
|
431
|
+
trigger: 'change'
|
|
432
432
|
},
|
|
433
433
|
{
|
|
434
434
|
type: 'email',
|
|
@@ -444,7 +444,9 @@ export default {
|
|
|
444
444
|
default: () => {
|
|
445
445
|
return {
|
|
446
446
|
placeholder: '请输入密码',
|
|
447
|
-
rules: [
|
|
447
|
+
rules: [
|
|
448
|
+
{ required: true, message: '密码不能为空', trigger: 'change' }
|
|
449
|
+
]
|
|
448
450
|
};
|
|
449
451
|
}
|
|
450
452
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}
|
|
1
|
+
@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content.es-table-border-none .es-table{border:0}.es-data-table-content.es-table-border-none .es-table::before{content:none}.es-data-table-content.es-table-border-none .es-table td,.es-data-table-content.es-table-border-none .es-table th{border:0}.es-data-table-content.es-table-border-none .es-table-page{border:0;margin-top:0;background-color:#fff}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}
|