easy3wui 1.5.88 → 1.5.89-beta10
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/CHANGELOG.md +189 -0
- package/HISTORY.md +8 -0
- package/LICENSE.md +3 -3
- package/README.md +27 -27
- package/assets/formPage.css +76 -0
- package/assets/globalHeader.css +1 -1
- package/assets/gridPage.css +83 -2
- package/assets/index.css +164 -4
- package/assets/loginLayout.css +1 -1
- package/assets/qryGrid.css +3 -0
- package/lib/Easy3wButton/index.js +51 -9
- package/lib/Easy3wFormPage/indexM.js +1 -1
- package/lib/Easy3wFormPage/indexPC.js +7 -2
- package/lib/Easy3wQryGrid/index.js +9 -6
- package/lib/Easy3wTagSelect/index.less +120 -120
- package/lib/Easy3wTree/index.js +16 -16
- package/package.json +122 -122
package/assets/index.css
CHANGED
|
@@ -172,7 +172,7 @@
|
|
|
172
172
|
}
|
|
173
173
|
.e3wGlobalHeaderRight .e3wGlobalHeaderAccount .e3wGlobalHeaderAvatar {
|
|
174
174
|
margin: 20px 8px 20px 0;
|
|
175
|
-
color:
|
|
175
|
+
color: var(--primary-color);
|
|
176
176
|
background: rgba(255, 255, 255, 0.85);
|
|
177
177
|
vertical-align: middle;
|
|
178
178
|
}
|
|
@@ -342,7 +342,7 @@
|
|
|
342
342
|
}
|
|
343
343
|
.e3wLoginLayoutRight .e3wLoginLayoutAccount .e3wLoginLayoutAvatar {
|
|
344
344
|
margin: 20px 8px 20px 0;
|
|
345
|
-
color:
|
|
345
|
+
color: var(--primary-color);
|
|
346
346
|
background: rgba(255, 255, 255, 0.85);
|
|
347
347
|
vertical-align: middle;
|
|
348
348
|
}
|
|
@@ -2321,6 +2321,33 @@
|
|
|
2321
2321
|
.scrollY .ant-table-thead > tr > th {
|
|
2322
2322
|
text-align: center;
|
|
2323
2323
|
}
|
|
2324
|
+
.scrollY .ant-table-tbody > tr:nth-child(even) > td {
|
|
2325
|
+
background: var(--table-header-bg);
|
|
2326
|
+
}
|
|
2327
|
+
.scrollY .ant-table-tbody > tr:nth-child(odd) > td {
|
|
2328
|
+
background: #fff;
|
|
2329
|
+
}
|
|
2330
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2331
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th,
|
|
2332
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2333
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th,
|
|
2334
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2335
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2336
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th,
|
|
2337
|
+
.scrollY .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th {
|
|
2338
|
+
background: var(--table-header-bg);
|
|
2339
|
+
}
|
|
2340
|
+
.scrollY .ant-table-tbody > tr:hover:not(.antd-table-expanded-row):not(.antd-table-row-selected) > td {
|
|
2341
|
+
background: var(--table-row-hover-bg);
|
|
2342
|
+
}
|
|
2343
|
+
.scrollY .ant-table-bordered .ant-table-thead > tr > th,
|
|
2344
|
+
.scrollY .ant-table-bordered .ant-table-tbody > tr > td {
|
|
2345
|
+
border-right: 0;
|
|
2346
|
+
}
|
|
2347
|
+
.scrollY .ant-table-thead > tr > th,
|
|
2348
|
+
.scrollY .ant-table-tbody > tr > td {
|
|
2349
|
+
border-bottom: 0;
|
|
2350
|
+
}
|
|
2324
2351
|
.scrollX .ant-table-thead > tr > th {
|
|
2325
2352
|
word-break: keep-all;
|
|
2326
2353
|
white-space: nowrap;
|
|
@@ -2353,6 +2380,33 @@
|
|
|
2353
2380
|
white-space: nowrap;
|
|
2354
2381
|
overflow: hidden;
|
|
2355
2382
|
}
|
|
2383
|
+
.scrollX .ant-table-tbody > tr:nth-child(even) > td {
|
|
2384
|
+
background: var(--table-header-bg);
|
|
2385
|
+
}
|
|
2386
|
+
.scrollX .ant-table-tbody > tr:nth-child(odd) > td {
|
|
2387
|
+
background: #fff;
|
|
2388
|
+
}
|
|
2389
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2390
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th,
|
|
2391
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2392
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th,
|
|
2393
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2394
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2395
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th,
|
|
2396
|
+
.scrollX .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th {
|
|
2397
|
+
background: var(--table-header-bg);
|
|
2398
|
+
}
|
|
2399
|
+
.scrollX .ant-table-tbody > tr:hover:not(.antd-table-expanded-row):not(.antd-table-row-selected) > td {
|
|
2400
|
+
background: var(--table-row-hover-bg);
|
|
2401
|
+
}
|
|
2402
|
+
.scrollX .ant-table-bordered .ant-table-thead > tr > th,
|
|
2403
|
+
.scrollX .ant-table-bordered .ant-table-tbody > tr > td {
|
|
2404
|
+
border-right: 0;
|
|
2405
|
+
}
|
|
2406
|
+
.scrollX .ant-table-thead > tr > th,
|
|
2407
|
+
.scrollX .ant-table-tbody > tr > td {
|
|
2408
|
+
border-bottom: 0;
|
|
2409
|
+
}
|
|
2356
2410
|
.scrollPrint .ant-table-thead > tr > th {
|
|
2357
2411
|
text-align: center;
|
|
2358
2412
|
}
|
|
@@ -2375,8 +2429,35 @@
|
|
|
2375
2429
|
max-width: 240px;
|
|
2376
2430
|
text-align: left;
|
|
2377
2431
|
}
|
|
2432
|
+
.scrollPrint .ant-table-tbody > tr:nth-child(even) > td {
|
|
2433
|
+
background: var(--table-header-bg);
|
|
2434
|
+
}
|
|
2435
|
+
.scrollPrint .ant-table-tbody > tr:nth-child(odd) > td {
|
|
2436
|
+
background: #fff;
|
|
2437
|
+
}
|
|
2438
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2439
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th,
|
|
2440
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2441
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th,
|
|
2442
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2443
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th,
|
|
2444
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th,
|
|
2445
|
+
.scrollPrint .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th {
|
|
2446
|
+
background: var(--table-header-bg);
|
|
2447
|
+
}
|
|
2448
|
+
.scrollPrint .ant-table-tbody > tr:hover:not(.antd-table-expanded-row):not(.antd-table-row-selected) > td {
|
|
2449
|
+
background: var(--table-row-hover-bg);
|
|
2450
|
+
}
|
|
2451
|
+
.scrollPrint .ant-table-bordered .ant-table-thead > tr > th,
|
|
2452
|
+
.scrollPrint .ant-table-bordered .ant-table-tbody > tr > td {
|
|
2453
|
+
border-right: 0;
|
|
2454
|
+
}
|
|
2455
|
+
.scrollPrint .ant-table-thead > tr > th,
|
|
2456
|
+
.scrollPrint .ant-table-tbody > tr > td {
|
|
2457
|
+
border-bottom: 0;
|
|
2458
|
+
}
|
|
2378
2459
|
.butt {
|
|
2379
|
-
background-color:
|
|
2460
|
+
background-color: var(--primary-color);
|
|
2380
2461
|
color: #fff;
|
|
2381
2462
|
font-size: 14px;
|
|
2382
2463
|
}
|
|
@@ -2384,7 +2465,7 @@
|
|
|
2384
2465
|
.butt:focus,
|
|
2385
2466
|
.butt:hover,
|
|
2386
2467
|
.butt:active {
|
|
2387
|
-
background-color:
|
|
2468
|
+
background-color: var(--primary-color);
|
|
2388
2469
|
color: #fff;
|
|
2389
2470
|
}
|
|
2390
2471
|
.onRow tr:hover {
|
|
@@ -2443,6 +2524,82 @@
|
|
|
2443
2524
|
.e3wFormPageWrap .bf-container {
|
|
2444
2525
|
border: 1px solid #eee;
|
|
2445
2526
|
}
|
|
2527
|
+
.e3wFormPageWrapPC .ant-form-item-label {
|
|
2528
|
+
line-height: 24px;
|
|
2529
|
+
}
|
|
2530
|
+
.e3wFormPageWrapPC .ant-form-item-control {
|
|
2531
|
+
line-height: 24px;
|
|
2532
|
+
}
|
|
2533
|
+
.e3wFormPageWrapPC .ant-form-item-required::before {
|
|
2534
|
+
content: "";
|
|
2535
|
+
}
|
|
2536
|
+
.e3wFormPageWrapPC .ant-form-item-label > label::after {
|
|
2537
|
+
content: "";
|
|
2538
|
+
margin: 0px;
|
|
2539
|
+
}
|
|
2540
|
+
.e3wFormPageWrapPC .ant-form-item-label > label {
|
|
2541
|
+
width: 100%;
|
|
2542
|
+
display: inline-block;
|
|
2543
|
+
overflow: hidden;
|
|
2544
|
+
white-space: nowrap;
|
|
2545
|
+
text-overflow: ellipsis;
|
|
2546
|
+
padding-right: 20px;
|
|
2547
|
+
}
|
|
2548
|
+
.e3wFormPageWrapPC .ant-form-item-label > label.ant-form-item-required::after {
|
|
2549
|
+
content: "*";
|
|
2550
|
+
color: var(--label-required-color);
|
|
2551
|
+
}
|
|
2552
|
+
.e3wFormPageWrapPC .ant-form-item-label > label.ant-form-item-required {
|
|
2553
|
+
position: relative;
|
|
2554
|
+
}
|
|
2555
|
+
.e3wFormPageWrapPC .ant-form-item-label > label.ant-form-item-required::after {
|
|
2556
|
+
position: absolute;
|
|
2557
|
+
right: 0;
|
|
2558
|
+
width: 20px;
|
|
2559
|
+
text-align: center;
|
|
2560
|
+
}
|
|
2561
|
+
.e3wFormPageWrapPC .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
|
|
2562
|
+
margin-left: 0;
|
|
2563
|
+
}
|
|
2564
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .bf-container {
|
|
2565
|
+
border: 1px solid #eee;
|
|
2566
|
+
}
|
|
2567
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper {
|
|
2568
|
+
border-bottom: 1px solid var(--primary-color);
|
|
2569
|
+
height: auto;
|
|
2570
|
+
}
|
|
2571
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper textarea {
|
|
2572
|
+
border: none;
|
|
2573
|
+
padding: 0;
|
|
2574
|
+
}
|
|
2575
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container {
|
|
2576
|
+
border: none;
|
|
2577
|
+
}
|
|
2578
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content > div {
|
|
2579
|
+
padding-bottom: 0;
|
|
2580
|
+
}
|
|
2581
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-container .public-DraftEditor-content {
|
|
2582
|
+
padding: 0;
|
|
2583
|
+
}
|
|
2584
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"]:not([data-fieldtype="e3wFormCol_strTemplate"]) .ant-form-item:has(.ant-form-item-label) > .ant-form-item-control-wrapper .bf-content {
|
|
2585
|
+
padding-bottom: 0;
|
|
2586
|
+
}
|
|
2587
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
|
|
2588
|
+
width: 100%;
|
|
2589
|
+
height: auto;
|
|
2590
|
+
}
|
|
2591
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper .e3wFootBtn:first-child {
|
|
2592
|
+
margin-left: 0;
|
|
2593
|
+
}
|
|
2594
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .e3wFormCol[data-fieldtype][data-col-readflag="1"][data-fieldtype="e3wFormCol_strTemplate"] .e3wFormStrTemplate .ant-form-item > .ant-form-item-control-wrapper {
|
|
2595
|
+
border-bottom: 1px solid var(--primary-color);
|
|
2596
|
+
}
|
|
2597
|
+
.approval_flag_only[data-e3wpagetype="approval"] .e3wFormPageWrapPC .ant-row.ant-form-item {
|
|
2598
|
+
display: -ms-flexbox;
|
|
2599
|
+
display: flex;
|
|
2600
|
+
-ms-flex-direction: row;
|
|
2601
|
+
flex-direction: row;
|
|
2602
|
+
}
|
|
2446
2603
|
input.ant-input-number-input {
|
|
2447
2604
|
text-align: right;
|
|
2448
2605
|
padding-right: 21px;
|
|
@@ -2713,3 +2870,6 @@ input.ant-input-number-input {
|
|
|
2713
2870
|
background: #fff;
|
|
2714
2871
|
padding: 0 24px;
|
|
2715
2872
|
}
|
|
2873
|
+
.e3wQryGrid .ant-form-item-label > label::after {
|
|
2874
|
+
content: "";
|
|
2875
|
+
}
|
package/assets/loginLayout.css
CHANGED
|
@@ -64,6 +64,12 @@ var _icon2 = _interopRequireDefault(_icon);
|
|
|
64
64
|
|
|
65
65
|
require('antd/lib/icon/style');
|
|
66
66
|
|
|
67
|
+
var _popover = require('antd/lib/popover');
|
|
68
|
+
|
|
69
|
+
var _popover2 = _interopRequireDefault(_popover);
|
|
70
|
+
|
|
71
|
+
require('antd/lib/popover/style');
|
|
72
|
+
|
|
67
73
|
var _notification = require('antd/lib/notification');
|
|
68
74
|
|
|
69
75
|
var _notification2 = _interopRequireDefault(_notification);
|
|
@@ -106,7 +112,10 @@ var Easy3wButton = function (_Component) {
|
|
|
106
112
|
func(e);
|
|
107
113
|
}
|
|
108
114
|
}, _this.getOneBtnObj = function (obj, index) {
|
|
109
|
-
var btnType = obj.btnType
|
|
115
|
+
var btnType = obj.btnType,
|
|
116
|
+
strPopoverContent = obj.strPopoverContent,
|
|
117
|
+
_obj$objPopoverConten = obj.objPopoverContent,
|
|
118
|
+
objPopoverContent = _obj$objPopoverConten === undefined ? {} : _obj$objPopoverConten;
|
|
110
119
|
|
|
111
120
|
var typeProps = {};
|
|
112
121
|
if (btnType) {
|
|
@@ -121,7 +130,7 @@ var Easy3wButton = function (_Component) {
|
|
|
121
130
|
} else {
|
|
122
131
|
typeProps = { type: 'primary' };
|
|
123
132
|
}
|
|
124
|
-
|
|
133
|
+
var btnEle = _react2['default'].createElement(
|
|
125
134
|
_button2['default'],
|
|
126
135
|
(0, _extends3['default'])({
|
|
127
136
|
onClick: function onClick(e) {
|
|
@@ -134,9 +143,17 @@ var Easy3wButton = function (_Component) {
|
|
|
134
143
|
}),
|
|
135
144
|
obj.cName
|
|
136
145
|
);
|
|
146
|
+
return strPopoverContent ? _react2['default'].createElement(
|
|
147
|
+
_popover2['default'],
|
|
148
|
+
(0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
|
|
149
|
+
btnEle
|
|
150
|
+
) : btnEle;
|
|
137
151
|
}, _this.getOneBtnTypeObj = function (obj, index) {
|
|
138
152
|
var props = obj.props,
|
|
139
|
-
btnType = obj.btnType
|
|
153
|
+
btnType = obj.btnType,
|
|
154
|
+
strPopoverContent = obj.strPopoverContent,
|
|
155
|
+
_obj$objPopoverConten2 = obj.objPopoverContent,
|
|
156
|
+
objPopoverContent = _obj$objPopoverConten2 === undefined ? {} : _obj$objPopoverConten2;
|
|
140
157
|
|
|
141
158
|
var typeProps = {};
|
|
142
159
|
if (btnType) {
|
|
@@ -151,7 +168,7 @@ var Easy3wButton = function (_Component) {
|
|
|
151
168
|
} else {
|
|
152
169
|
typeProps = { type: 'primary' };
|
|
153
170
|
}
|
|
154
|
-
|
|
171
|
+
var btnEle = _react2['default'].createElement(
|
|
155
172
|
_upload2['default'],
|
|
156
173
|
props,
|
|
157
174
|
_react2['default'].createElement(
|
|
@@ -168,11 +185,19 @@ var Easy3wButton = function (_Component) {
|
|
|
168
185
|
obj.cName
|
|
169
186
|
)
|
|
170
187
|
);
|
|
188
|
+
return strPopoverContent ? _react2['default'].createElement(
|
|
189
|
+
_popover2['default'],
|
|
190
|
+
(0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
|
|
191
|
+
btnEle
|
|
192
|
+
) : btnEle;
|
|
171
193
|
}, _this.getOneBtnPopconfirmObj = function (obj, index) {
|
|
172
194
|
var func = obj.func,
|
|
173
195
|
cName = obj.cName,
|
|
174
196
|
confirmContent = obj.confirmContent,
|
|
175
|
-
btnType = obj.btnType
|
|
197
|
+
btnType = obj.btnType,
|
|
198
|
+
strPopoverContent = obj.strPopoverContent,
|
|
199
|
+
_obj$objPopoverConten3 = obj.objPopoverContent,
|
|
200
|
+
objPopoverContent = _obj$objPopoverConten3 === undefined ? {} : _obj$objPopoverConten3;
|
|
176
201
|
|
|
177
202
|
var typeProps = {};
|
|
178
203
|
if (btnType) {
|
|
@@ -187,7 +212,7 @@ var Easy3wButton = function (_Component) {
|
|
|
187
212
|
} else {
|
|
188
213
|
typeProps = { type: 'primary' };
|
|
189
214
|
}
|
|
190
|
-
|
|
215
|
+
var btnEle = _react2['default'].createElement(
|
|
191
216
|
_popconfirm2['default'],
|
|
192
217
|
{ title: confirmContent, onConfirm: function onConfirm(e) {
|
|
193
218
|
return _this.onClickFunc(e, func);
|
|
@@ -198,6 +223,11 @@ var Easy3wButton = function (_Component) {
|
|
|
198
223
|
cName
|
|
199
224
|
)
|
|
200
225
|
);
|
|
226
|
+
return strPopoverContent ? _react2['default'].createElement(
|
|
227
|
+
_popover2['default'],
|
|
228
|
+
(0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
|
|
229
|
+
btnEle
|
|
230
|
+
) : btnEle;
|
|
201
231
|
}, _this.getDropdownArrObj = function (obj) {
|
|
202
232
|
var cName = obj.cName,
|
|
203
233
|
dropdownArr = obj.dropdownArr,
|
|
@@ -205,14 +235,22 @@ var Easy3wButton = function (_Component) {
|
|
|
205
235
|
dropdownProps = _obj$dropdownProps === undefined ? {} : _obj$dropdownProps;
|
|
206
236
|
|
|
207
237
|
var menuArr = dropdownArr.map(function (dropdown) {
|
|
208
|
-
var func = dropdown.func
|
|
209
|
-
|
|
238
|
+
var func = dropdown.func,
|
|
239
|
+
strPopoverContent = dropdown.strPopoverContent,
|
|
240
|
+
_dropdown$objPopoverC = dropdown.objPopoverContent,
|
|
241
|
+
objPopoverContent = _dropdown$objPopoverC === undefined ? {} : _dropdown$objPopoverC;
|
|
242
|
+
|
|
243
|
+
var menuItemCName = strPopoverContent ? _react2['default'].createElement(
|
|
244
|
+
_popover2['default'],
|
|
245
|
+
(0, _extends3['default'])({ placement: 'topRight', content: strPopoverContent }, objPopoverContent),
|
|
246
|
+
dropdown.cName
|
|
247
|
+
) : dropdown.cName;
|
|
210
248
|
return _react2['default'].createElement(
|
|
211
249
|
_menu2['default'].Item,
|
|
212
250
|
{ key: cName, onClick: function onClick(e) {
|
|
213
251
|
return _this.onClickFunc(e, func);
|
|
214
252
|
} },
|
|
215
|
-
|
|
253
|
+
menuItemCName
|
|
216
254
|
);
|
|
217
255
|
});
|
|
218
256
|
var menuOverlay = _react2['default'].createElement(
|
|
@@ -240,12 +278,16 @@ var Easy3wButton = function (_Component) {
|
|
|
240
278
|
dropdownArr = btn.dropdownArr;
|
|
241
279
|
|
|
242
280
|
if (type) {
|
|
281
|
+
// 附件上传
|
|
243
282
|
return _this.getOneBtnTypeObj(btn, index);
|
|
244
283
|
} else if (dropdownArr) {
|
|
284
|
+
// 下拉按钮
|
|
245
285
|
return _this.getDropdownArrObj(btn, index);
|
|
246
286
|
} else if (confirmContent) {
|
|
287
|
+
// 二次确认
|
|
247
288
|
return _this.getOneBtnPopconfirmObj(btn, index);
|
|
248
289
|
} else {
|
|
290
|
+
// 单按钮
|
|
249
291
|
return _this.getOneBtnObj(btn, index);
|
|
250
292
|
}
|
|
251
293
|
});
|
|
@@ -2699,7 +2699,7 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
|
|
|
2699
2699
|
{ noStyle: true, spinLoading: spinLoading },
|
|
2700
2700
|
_react2['default'].createElement(
|
|
2701
2701
|
'div',
|
|
2702
|
-
{ className: (0, _classnames2['default'])(['e3wFormPageWrap']) },
|
|
2702
|
+
{ className: (0, _classnames2['default'])(['e3wFormPageWrap', 'e3wFormPageWrapM']) },
|
|
2703
2703
|
this.getAllForms()
|
|
2704
2704
|
)
|
|
2705
2705
|
);
|
|
@@ -1390,15 +1390,20 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
|
|
|
1390
1390
|
}, _this.getColItem = function (colObj, formItemLayout, disableCheckFlag) {
|
|
1391
1391
|
var allReadFlag = _this.props.allReadFlag;
|
|
1392
1392
|
var fieldType = colObj.fieldType,
|
|
1393
|
-
readFlag = colObj.readFlag,
|
|
1394
1393
|
disableFlag = colObj.disableFlag,
|
|
1395
1394
|
cmptPros = colObj.cmptPros;
|
|
1395
|
+
var readFlag = colObj.readFlag;
|
|
1396
1396
|
|
|
1397
1397
|
var _ref6 = cmptPros || {},
|
|
1398
1398
|
disabled = _ref6.disabled,
|
|
1399
1399
|
templateArray = _ref6.templateArray,
|
|
1400
1400
|
isRead = _ref6.isRead;
|
|
1401
1401
|
|
|
1402
|
+
var isApprovalFlag = document.body.innerHTML.includes('data-e3wpagetype="approval"');
|
|
1403
|
+
if (isApprovalFlag && disableFlag && (fieldType === 'input' || fieldType === 'textarea')) {
|
|
1404
|
+
colObj.readFlag = true;
|
|
1405
|
+
readFlag = true;
|
|
1406
|
+
}
|
|
1402
1407
|
var itemArea = _this.getItemArea(colObj);
|
|
1403
1408
|
var itemValue = _this.getItemValue(colObj);
|
|
1404
1409
|
var afterBtns = _this.getAfterBtn(colObj);
|
|
@@ -2640,7 +2645,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
|
|
|
2640
2645
|
{ noStyle: true, spinLoading: spinLoading },
|
|
2641
2646
|
_react2['default'].createElement(
|
|
2642
2647
|
'div',
|
|
2643
|
-
{ className: (0, _classnames2['default'])(['e3wFormPageWrap']) },
|
|
2648
|
+
{ className: (0, _classnames2['default'])(['e3wFormPageWrap', 'e3wFormPageWrapPC']) },
|
|
2644
2649
|
this.getAllForms()
|
|
2645
2650
|
)
|
|
2646
2651
|
);
|
|
@@ -704,13 +704,16 @@ var Easy3wQryGrid = function (_Component) {
|
|
|
704
704
|
/** cascader end */
|
|
705
705
|
|
|
706
706
|
Easy3wQryGrid.prototype.render = function render() {
|
|
707
|
-
return
|
|
708
|
-
|
|
709
|
-
{ className: 'ant-advanced-search-form' },
|
|
707
|
+
return (
|
|
708
|
+
// <div className="ant-advanced-search-form">
|
|
710
709
|
_react2['default'].createElement(
|
|
711
|
-
|
|
712
|
-
{
|
|
713
|
-
|
|
710
|
+
'div',
|
|
711
|
+
{ className: (0, _classnames2['default'])(['e3wQryGrid']) },
|
|
712
|
+
_react2['default'].createElement(
|
|
713
|
+
_row2['default'],
|
|
714
|
+
{ gutter: 24 },
|
|
715
|
+
this.getFields()
|
|
716
|
+
)
|
|
714
717
|
)
|
|
715
718
|
);
|
|
716
719
|
};
|
|
@@ -1,120 +1,120 @@
|
|
|
1
|
-
@import '~antd/lib/style/themes/default.less';
|
|
2
|
-
|
|
3
|
-
.tagSelect {
|
|
4
|
-
user-select: none;
|
|
5
|
-
margin-left: -8px;
|
|
6
|
-
position: relative;
|
|
7
|
-
overflow: hidden;
|
|
8
|
-
max-height: 32px;
|
|
9
|
-
// line-height: 32px;
|
|
10
|
-
transition: all 0.3s;
|
|
11
|
-
:global {
|
|
12
|
-
.ant-tag {
|
|
13
|
-
padding: 0 8px;
|
|
14
|
-
margin-right: 24px;
|
|
15
|
-
font-size: @font-size-base;
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
&.expanded {
|
|
19
|
-
transition: all 0.3s;
|
|
20
|
-
max-height: 800px;
|
|
21
|
-
}
|
|
22
|
-
.trigger {
|
|
23
|
-
position: absolute;
|
|
24
|
-
top: 0;
|
|
25
|
-
right: 0;
|
|
26
|
-
i {
|
|
27
|
-
font-size: 12px;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
&.hasExpandTag {
|
|
31
|
-
padding-right: 50px;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
.standardFormRow {
|
|
36
|
-
border-bottom: 1px dashed @border-color-split;
|
|
37
|
-
// padding-bottom: 8px;
|
|
38
|
-
// margin-bottom: 8px;
|
|
39
|
-
display: flex;
|
|
40
|
-
:global {
|
|
41
|
-
.ant-form-item {
|
|
42
|
-
margin-right: 24px;
|
|
43
|
-
}
|
|
44
|
-
.ant-form-item-label label {
|
|
45
|
-
color: @text-color;
|
|
46
|
-
margin-right: 0;
|
|
47
|
-
}
|
|
48
|
-
.ant-form-item-label,
|
|
49
|
-
.ant-form-item-control {
|
|
50
|
-
padding: 0;
|
|
51
|
-
line-height: 32px;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
.label {
|
|
55
|
-
// color: @heading-color;
|
|
56
|
-
// color: rgb(173,124,89);
|
|
57
|
-
font-size: @font-size-base;
|
|
58
|
-
padding-right: 12px;
|
|
59
|
-
margin-right: 12px;
|
|
60
|
-
// margin-right: 24px;
|
|
61
|
-
background:#F8F8FF;
|
|
62
|
-
// background: rgb(84, 104, 178);
|
|
63
|
-
// opacity: 0.5;
|
|
64
|
-
flex: 0 0 auto;
|
|
65
|
-
text-align: right;
|
|
66
|
-
& > span {
|
|
67
|
-
display: inline-block;
|
|
68
|
-
height: 32px;
|
|
69
|
-
line-height: 32px;
|
|
70
|
-
&:after {
|
|
71
|
-
content: '|';
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
// border-radius: 2px;
|
|
75
|
-
& > a {
|
|
76
|
-
color: @heading-color;
|
|
77
|
-
// color: rgb(255, 255, 255);
|
|
78
|
-
display: inline-block;
|
|
79
|
-
height: 32px;
|
|
80
|
-
line-height: 32px;
|
|
81
|
-
// width: 100%;
|
|
82
|
-
cursor: pointer;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
.content {
|
|
86
|
-
flex: 1 1 0;
|
|
87
|
-
:global {
|
|
88
|
-
.ant-form-item:last-child {
|
|
89
|
-
margin-right: 0;
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
.standardFormRowLast {
|
|
96
|
-
border: none;
|
|
97
|
-
padding-bottom: 0;
|
|
98
|
-
margin-bottom: 0;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
.standardFormRowBlock {
|
|
102
|
-
:global {
|
|
103
|
-
.ant-form-item,
|
|
104
|
-
div.ant-form-item-control-wrapper {
|
|
105
|
-
display: block;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
.standardFormRowGrid {
|
|
111
|
-
:global {
|
|
112
|
-
.ant-form-item,
|
|
113
|
-
div.ant-form-item-control-wrapper {
|
|
114
|
-
display: block;
|
|
115
|
-
}
|
|
116
|
-
.ant-form-item-label {
|
|
117
|
-
float: left;
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
}
|
|
1
|
+
@import '~antd/lib/style/themes/default.less';
|
|
2
|
+
|
|
3
|
+
.tagSelect {
|
|
4
|
+
user-select: none;
|
|
5
|
+
margin-left: -8px;
|
|
6
|
+
position: relative;
|
|
7
|
+
overflow: hidden;
|
|
8
|
+
max-height: 32px;
|
|
9
|
+
// line-height: 32px;
|
|
10
|
+
transition: all 0.3s;
|
|
11
|
+
:global {
|
|
12
|
+
.ant-tag {
|
|
13
|
+
padding: 0 8px;
|
|
14
|
+
margin-right: 24px;
|
|
15
|
+
font-size: @font-size-base;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
&.expanded {
|
|
19
|
+
transition: all 0.3s;
|
|
20
|
+
max-height: 800px;
|
|
21
|
+
}
|
|
22
|
+
.trigger {
|
|
23
|
+
position: absolute;
|
|
24
|
+
top: 0;
|
|
25
|
+
right: 0;
|
|
26
|
+
i {
|
|
27
|
+
font-size: 12px;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
&.hasExpandTag {
|
|
31
|
+
padding-right: 50px;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
.standardFormRow {
|
|
36
|
+
border-bottom: 1px dashed @border-color-split;
|
|
37
|
+
// padding-bottom: 8px;
|
|
38
|
+
// margin-bottom: 8px;
|
|
39
|
+
display: flex;
|
|
40
|
+
:global {
|
|
41
|
+
.ant-form-item {
|
|
42
|
+
margin-right: 24px;
|
|
43
|
+
}
|
|
44
|
+
.ant-form-item-label label {
|
|
45
|
+
color: @text-color;
|
|
46
|
+
margin-right: 0;
|
|
47
|
+
}
|
|
48
|
+
.ant-form-item-label,
|
|
49
|
+
.ant-form-item-control {
|
|
50
|
+
padding: 0;
|
|
51
|
+
line-height: 32px;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
.label {
|
|
55
|
+
// color: @heading-color;
|
|
56
|
+
// color: rgb(173,124,89);
|
|
57
|
+
font-size: @font-size-base;
|
|
58
|
+
padding-right: 12px;
|
|
59
|
+
margin-right: 12px;
|
|
60
|
+
// margin-right: 24px;
|
|
61
|
+
background:#F8F8FF;
|
|
62
|
+
// background: rgb(84, 104, 178);
|
|
63
|
+
// opacity: 0.5;
|
|
64
|
+
flex: 0 0 auto;
|
|
65
|
+
text-align: right;
|
|
66
|
+
& > span {
|
|
67
|
+
display: inline-block;
|
|
68
|
+
height: 32px;
|
|
69
|
+
line-height: 32px;
|
|
70
|
+
&:after {
|
|
71
|
+
content: '|';
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
// border-radius: 2px;
|
|
75
|
+
& > a {
|
|
76
|
+
color: @heading-color;
|
|
77
|
+
// color: rgb(255, 255, 255);
|
|
78
|
+
display: inline-block;
|
|
79
|
+
height: 32px;
|
|
80
|
+
line-height: 32px;
|
|
81
|
+
// width: 100%;
|
|
82
|
+
cursor: pointer;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
.content {
|
|
86
|
+
flex: 1 1 0;
|
|
87
|
+
:global {
|
|
88
|
+
.ant-form-item:last-child {
|
|
89
|
+
margin-right: 0;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
.standardFormRowLast {
|
|
96
|
+
border: none;
|
|
97
|
+
padding-bottom: 0;
|
|
98
|
+
margin-bottom: 0;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
.standardFormRowBlock {
|
|
102
|
+
:global {
|
|
103
|
+
.ant-form-item,
|
|
104
|
+
div.ant-form-item-control-wrapper {
|
|
105
|
+
display: block;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
.standardFormRowGrid {
|
|
111
|
+
:global {
|
|
112
|
+
.ant-form-item,
|
|
113
|
+
div.ant-form-item-control-wrapper {
|
|
114
|
+
display: block;
|
|
115
|
+
}
|
|
116
|
+
.ant-form-item-label {
|
|
117
|
+
float: left;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|