eoss-ui 0.5.55 → 0.5.58
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 +19 -9
- package/lib/button.js +4 -4
- package/lib/cascader.js +2 -2
- package/lib/checkbox-group.js +2 -2
- package/lib/data-table-form.js +2 -2
- package/lib/data-table.js +32 -19
- package/lib/date-picker.js +4 -4
- package/lib/dialog.js +2 -2
- package/lib/eoss-ui.common.js +179 -61
- package/lib/flow-group.js +2 -2
- package/lib/flow-list.js +2 -2
- package/lib/flow.js +6 -7
- package/lib/form.js +2 -2
- package/lib/handle-user.js +2 -2
- package/lib/handler.js +2 -2
- package/lib/icon.js +3841 -0
- package/lib/icons.js +2 -2
- package/lib/index.js +1 -1
- package/lib/input-number.js +4 -4
- package/lib/input.js +4 -4
- package/lib/label.js +2 -2
- package/lib/login.js +2 -2
- package/lib/main.js +2 -2
- package/lib/menu.js +2 -2
- package/lib/nav.js +4 -4
- package/lib/notify.js +2 -2
- package/lib/page.js +4 -4
- package/lib/pagination.js +2 -2
- package/lib/player.js +4 -4
- package/lib/qr-code.js +4 -4
- package/lib/radio-group.js +4 -4
- package/lib/retrial-auth.js +4 -4
- package/lib/select-ganged.js +4 -4
- package/lib/select.js +4 -4
- package/lib/selector-panel.js +2 -2
- package/lib/selector.js +11 -11
- package/lib/sizer.js +4 -4
- package/lib/steps.js +4 -4
- package/lib/switch.js +11 -11
- package/lib/table-form.js +4 -4
- package/lib/tabs-panel.js +2 -2
- package/lib/tabs.js +4 -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 +4 -4
- package/lib/toolbar.js +2 -2
- package/lib/tree-group.js +4 -4
- package/lib/tree.js +10 -8
- package/lib/upload.js +2 -2
- package/lib/utils/util.js +2 -2
- package/lib/wujie.js +4 -4
- package/lib/wxlogin.js +137 -137
- package/package.json +1 -1
- package/packages/button-group/src/main.vue +5 -5
- package/packages/data-table/src/column.vue +1 -1
- package/packages/data-table/src/main.vue +14 -4
- package/packages/flow/src/main.vue +2 -3
- package/packages/icon/index.js +5 -0
- package/packages/icon/src/main.vue +43 -0
- 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/tree/src/main.vue +14 -2
- package/src/index.js +4 -1
- package/src/utils/util.js +2 -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
|
/******/ ({
|
|
@@ -2005,7 +2005,7 @@ var isFunction = function isFunction(obj) {
|
|
|
2005
2005
|
* @param {object} [to] - 路由跳转信息
|
|
2006
2006
|
* @param {object} [from] - 路由来源信息
|
|
2007
2007
|
* @param {function} [next] - 跳转函数
|
|
2008
|
-
* @param {array} [exclude] - 不拦截的路由
|
|
2008
|
+
* @param {array/boolean} [exclude] - 不拦截的路由
|
|
2009
2009
|
* @param {boolean} [open] - 是否新窗口打开
|
|
2010
2010
|
* @param {boolean} [cookie] - 是否尝试采用
|
|
2011
2011
|
* @param {sting} [loginPage] - 第三方登录页面地址
|
|
@@ -2158,7 +2158,7 @@ var isLogined = function isLogined(_ref8) {
|
|
|
2158
2158
|
});
|
|
2159
2159
|
}
|
|
2160
2160
|
}).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') {
|
|
2161
|
+
} 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
2162
|
if (redirect && (to.path === '/main' || to.path === '/login')) {
|
|
2163
2163
|
window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
|
|
2164
2164
|
} else {
|
|
@@ -3583,7 +3583,140 @@ module.exports = require("json-bigint");
|
|
|
3583
3583
|
|
|
3584
3584
|
/***/ }),
|
|
3585
3585
|
|
|
3586
|
-
/***/
|
|
3586
|
+
/***/ 7:
|
|
3587
|
+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
3588
|
+
|
|
3589
|
+
"use strict";
|
|
3590
|
+
/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
|
|
3591
|
+
/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
|
|
3592
|
+
/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
|
|
3593
|
+
/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
|
|
3594
|
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
3595
|
+
|
|
3596
|
+
|
|
3597
|
+
|
|
3598
|
+
|
|
3599
|
+
var WebSocket = function () {
|
|
3600
|
+
// 构造函数
|
|
3601
|
+
function WebSocket() {
|
|
3602
|
+
_classCallCheck(this, WebSocket);
|
|
3603
|
+
|
|
3604
|
+
this.host = sessionStorage.getItem('wshost') || '';
|
|
3605
|
+
this.tryTimes = 1; // 重连次数
|
|
3606
|
+
this.callback = null; // 回调函数
|
|
3607
|
+
this.client = null; // stomp对象
|
|
3608
|
+
this.reconTimeout = null; // 重连延时器
|
|
3609
|
+
this.debug = true; // 调试
|
|
3610
|
+
this.interval = 20; // 重连间隔时间
|
|
3611
|
+
this.vm = null;
|
|
3612
|
+
this.nextDate = 0;
|
|
3613
|
+
this.connects = 1;
|
|
3614
|
+
this.recon = false;
|
|
3615
|
+
this.sendTimeout = null;
|
|
3616
|
+
}
|
|
3617
|
+
|
|
3618
|
+
/** socket连接 */
|
|
3619
|
+
|
|
3620
|
+
|
|
3621
|
+
WebSocket.prototype.connect = function connect() {
|
|
3622
|
+
var _this = this;
|
|
3623
|
+
|
|
3624
|
+
if (!this.client) {
|
|
3625
|
+
// 连接SockJS
|
|
3626
|
+
var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
|
|
3627
|
+
// 获取STOMP子协议的客户端对象
|
|
3628
|
+
this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
|
|
3629
|
+
}
|
|
3630
|
+
|
|
3631
|
+
// 日志不打印
|
|
3632
|
+
if (!this.debug) {
|
|
3633
|
+
console.log(111);
|
|
3634
|
+
this.client.debug = function () {};
|
|
3635
|
+
}
|
|
3636
|
+
|
|
3637
|
+
// 向服务器发起websocket连接
|
|
3638
|
+
this.client.connect({}, function () {
|
|
3639
|
+
_this.recon = true;
|
|
3640
|
+
// tryTimes定义重置
|
|
3641
|
+
_this.connects = 1;
|
|
3642
|
+
// 订阅消息
|
|
3643
|
+
_this.subscribe();
|
|
3644
|
+
}, function (error) {
|
|
3645
|
+
var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
|
|
3646
|
+
if (_this.connects > 5 && diffSecond < _this.interval) {
|
|
3647
|
+
_this.client.disconnect();
|
|
3648
|
+
_this.error && _this.error(error);
|
|
3649
|
+
} else {
|
|
3650
|
+
_this.reconTimeout = setTimeout(function () {
|
|
3651
|
+
_this.connect();
|
|
3652
|
+
_this.connects++;
|
|
3653
|
+
}, 5000);
|
|
3654
|
+
}
|
|
3655
|
+
});
|
|
3656
|
+
};
|
|
3657
|
+
/** 订阅服务端 */
|
|
3658
|
+
|
|
3659
|
+
|
|
3660
|
+
WebSocket.prototype.subscribe = function subscribe() {
|
|
3661
|
+
var _this2 = this;
|
|
3662
|
+
|
|
3663
|
+
// 订阅服务端提供的某个topic
|
|
3664
|
+
this.client.subscribe(this.take, function (response) {
|
|
3665
|
+
if (response && (_this2.callback || _this2.success)) {
|
|
3666
|
+
var callback = _this2.callback || _this2.success;
|
|
3667
|
+
callback(JSON.parse(response.body));
|
|
3668
|
+
}
|
|
3669
|
+
});
|
|
3670
|
+
};
|
|
3671
|
+
|
|
3672
|
+
/** 赋值、初始化socket */
|
|
3673
|
+
|
|
3674
|
+
|
|
3675
|
+
WebSocket.prototype.init = function init(option, vm) {
|
|
3676
|
+
for (var i in option) {
|
|
3677
|
+
this[i] = option[i];
|
|
3678
|
+
}
|
|
3679
|
+
this.vm = vm;
|
|
3680
|
+
// 初始化连接
|
|
3681
|
+
this.connect();
|
|
3682
|
+
};
|
|
3683
|
+
|
|
3684
|
+
/** 发送消息 */
|
|
3685
|
+
|
|
3686
|
+
|
|
3687
|
+
WebSocket.prototype.send = function send(data) {
|
|
3688
|
+
var _this3 = this;
|
|
3689
|
+
|
|
3690
|
+
if (this.recon) {
|
|
3691
|
+
clearTimeout(this.sendTimeout);
|
|
3692
|
+
this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
|
|
3693
|
+
} else {
|
|
3694
|
+
this.sendTimeout = setTimeout(function () {
|
|
3695
|
+
_this3.send(data);
|
|
3696
|
+
}, 1000);
|
|
3697
|
+
}
|
|
3698
|
+
};
|
|
3699
|
+
|
|
3700
|
+
/** 销毁 */
|
|
3701
|
+
|
|
3702
|
+
|
|
3703
|
+
WebSocket.prototype.destroy = function destroy() {
|
|
3704
|
+
// 断开连接,清除定时器
|
|
3705
|
+
if (this.client) {
|
|
3706
|
+
this.client.disconnect();
|
|
3707
|
+
};
|
|
3708
|
+
this.reconTimeout && clearTimeout(this.reconTimeout);
|
|
3709
|
+
this.sendTimeout && clearTimeout(this.sendTimeout);
|
|
3710
|
+
};
|
|
3711
|
+
|
|
3712
|
+
return WebSocket;
|
|
3713
|
+
}();
|
|
3714
|
+
|
|
3715
|
+
/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
|
|
3716
|
+
|
|
3717
|
+
/***/ }),
|
|
3718
|
+
|
|
3719
|
+
/***/ 70:
|
|
3587
3720
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
3588
3721
|
|
|
3589
3722
|
"use strict";
|
|
@@ -3772,139 +3905,6 @@ main.install = function (Vue) {
|
|
|
3772
3905
|
|
|
3773
3906
|
/***/ }),
|
|
3774
3907
|
|
|
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
3908
|
/***/ 8:
|
|
3909
3909
|
/***/ (function(module, exports) {
|
|
3910
3910
|
|
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
|
>
|
|
@@ -117,8 +117,8 @@ export default {
|
|
|
117
117
|
this.$emit('handle-click', obj);
|
|
118
118
|
},
|
|
119
119
|
handleCommand(res) {
|
|
120
|
-
this.$emit('handleClick', {
|
|
121
|
-
this.$emit('handle-click', {
|
|
120
|
+
this.$emit('handleClick', { ...this.data, handle: res });
|
|
121
|
+
this.$emit('handle-click', { ...this.data, handle: res });
|
|
122
122
|
},
|
|
123
123
|
resetWidth() {
|
|
124
124
|
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 = [];
|
|
@@ -1784,7 +1784,7 @@ export default {
|
|
|
1784
1784
|
this.isHideOtherOrg = false;
|
|
1785
1785
|
this.isNodeShowProcess = false;
|
|
1786
1786
|
this.isMainSubProcess = false;
|
|
1787
|
-
this.isNextUser =
|
|
1787
|
+
this.isNextUser =this.nextNode.nextOperate != 9 ;
|
|
1788
1788
|
// this.isMainSubProcess === true
|
|
1789
1789
|
// ? (this.isMainSubProcess = true)
|
|
1790
1790
|
// : (this.isMainSubProcess = false);
|
|
@@ -1961,6 +1961,7 @@ export default {
|
|
|
1961
1961
|
return;
|
|
1962
1962
|
} else {
|
|
1963
1963
|
}
|
|
1964
|
+
|
|
1964
1965
|
if (isDef !== true) this.getNodeInfo();
|
|
1965
1966
|
},
|
|
1966
1967
|
/**
|
|
@@ -2039,7 +2040,6 @@ export default {
|
|
|
2039
2040
|
isCanRemoveSign,
|
|
2040
2041
|
attachedCode,
|
|
2041
2042
|
isSpecial,
|
|
2042
|
-
opinion,
|
|
2043
2043
|
canPresetRead,
|
|
2044
2044
|
isCdjxjTaskHandle,
|
|
2045
2045
|
taskButtonList
|
|
@@ -2101,7 +2101,6 @@ export default {
|
|
|
2101
2101
|
});
|
|
2102
2102
|
this.selecNext(this.nextNode.nextOperate, true, true);
|
|
2103
2103
|
}
|
|
2104
|
-
|
|
2105
2104
|
if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
|
|
2106
2105
|
this.needRetrialAuth =
|
|
2107
2106
|
!!nodeInfoMap.nodeExtAttr.isCurrentNodeSubmitNeedRetrialAuth;
|
|
@@ -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>
|
|
@@ -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}
|