@zat-design/sisyphus-react 3.10.2 → 3.10.3-beta.2
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/dist/index.esm.css +47 -34
- package/dist/less.esm.css +47 -34
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.d.ts +1 -1
- package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +4 -4
- package/es/ProEditTable/components/RenderField/index.js +2 -1
- package/es/ProEditTable/index.js +39 -11
- package/es/ProEditTable/propsType.d.ts +1 -1
- package/es/ProEditTable/style/index.less +3 -1
- package/es/ProEditTable/utils/config.d.ts +1 -1
- package/es/ProEditTable/utils/config.js +11 -3
- package/es/ProEditTable/utils/diffOriginal.d.ts +1 -1
- package/es/ProEditTable/utils/diffOriginal.js +3 -3
- package/es/ProForm/components/combination/ProModalSelect/index.js +2 -2
- package/es/ProForm/components/render/ChangedWrapper.d.ts +1 -1
- package/es/ProForm/components/render/ChangedWrapper.js +5 -6
- package/es/ProForm/components/render/Render.js +3 -2
- package/es/ProForm/components/render/RenderFields.js +2 -3
- package/es/ProForm/components/render/propsType.d.ts +1 -2
- package/es/ProForm/utils/_useChanged.d.ts +2 -2
- package/es/ProForm/utils/_useChanged.js +3 -3
- package/es/ProForm/utils/_useListChanged.d.ts +1 -1
- package/es/ProForm/utils/_useListChanged.js +3 -3
- package/es/ProForm/utils/diffOriginal.d.ts +1 -1
- package/es/ProForm/utils/diffOriginal.js +3 -3
- package/es/ProForm/utils/transformValue.js +9 -7
- package/es/ProStep/components/Anchor/index.js +12 -10
- package/es/ProStep/components/Listener/index.js +25 -0
- package/es/ProStep/components/Step/index.js +2 -2
- package/es/ProStep/style/index.less +28 -16
- package/es/ProTable/components/FormatColumn/index.js +0 -5
- package/es/ProTable/components/RenderColumn/index.js +55 -42
- package/es/ProTable/hooks/useAntdTable.js +45 -46
- package/es/ProTable/style/index.less +3 -1
- package/es/ProTable/utils/index.d.ts +8 -0
- package/es/ProTable/utils/index.js +19 -0
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.d.ts +1 -1
- package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +4 -4
- package/lib/ProEditTable/components/RenderField/index.js +2 -1
- package/lib/ProEditTable/index.js +38 -10
- package/lib/ProEditTable/propsType.d.ts +1 -1
- package/lib/ProEditTable/style/index.less +3 -1
- package/lib/ProEditTable/utils/config.d.ts +1 -1
- package/lib/ProEditTable/utils/config.js +11 -3
- package/lib/ProEditTable/utils/diffOriginal.d.ts +1 -1
- package/lib/ProEditTable/utils/diffOriginal.js +3 -3
- package/lib/ProForm/components/combination/ProModalSelect/index.js +1 -1
- package/lib/ProForm/components/render/ChangedWrapper.d.ts +1 -1
- package/lib/ProForm/components/render/ChangedWrapper.js +5 -6
- package/lib/ProForm/components/render/Render.js +3 -2
- package/lib/ProForm/components/render/RenderFields.js +2 -3
- package/lib/ProForm/components/render/propsType.d.ts +1 -2
- package/lib/ProForm/utils/_useChanged.d.ts +2 -2
- package/lib/ProForm/utils/_useChanged.js +3 -3
- package/lib/ProForm/utils/_useListChanged.d.ts +1 -1
- package/lib/ProForm/utils/_useListChanged.js +3 -3
- package/lib/ProForm/utils/diffOriginal.d.ts +1 -1
- package/lib/ProForm/utils/diffOriginal.js +3 -3
- package/lib/ProForm/utils/transformValue.js +9 -7
- package/lib/ProStep/components/Anchor/index.js +11 -10
- package/lib/ProStep/components/Listener/index.js +25 -0
- package/lib/ProStep/components/Step/index.js +2 -2
- package/lib/ProStep/style/index.less +28 -16
- package/lib/ProTable/components/FormatColumn/index.js +0 -5
- package/lib/ProTable/components/RenderColumn/index.js +56 -43
- package/lib/ProTable/hooks/useAntdTable.js +42 -43
- package/lib/ProTable/style/index.less +3 -1
- package/lib/ProTable/utils/index.d.ts +8 -0
- package/lib/ProTable/utils/index.js +20 -1
- package/package.json +1 -1
package/dist/index.esm.css
CHANGED
@@ -1490,7 +1490,7 @@
|
|
1490
1490
|
-webkit-transition: width 0.2s;
|
1491
1491
|
transition: width 0.2s;
|
1492
1492
|
}
|
1493
|
-
.pro-step > .step-menu {
|
1493
|
+
.pro-step > .pro-step-menu {
|
1494
1494
|
display: -webkit-box;
|
1495
1495
|
display: -webkit-flex;
|
1496
1496
|
display: -ms-flexbox;
|
@@ -1504,7 +1504,7 @@
|
|
1504
1504
|
font-size: var(--zaui-font-size-lg, 16px);
|
1505
1505
|
border-bottom: 1px solid var(--zaui-line, #dddddd);
|
1506
1506
|
}
|
1507
|
-
.pro-step > .step-menu > .anticon {
|
1507
|
+
.pro-step > .pro-step-menu > .anticon {
|
1508
1508
|
display: -webkit-box;
|
1509
1509
|
display: -webkit-flex;
|
1510
1510
|
display: -ms-flexbox;
|
@@ -1520,13 +1520,13 @@
|
|
1520
1520
|
width: 48px;
|
1521
1521
|
height: 24px;
|
1522
1522
|
}
|
1523
|
-
.pro-step > .step-menu > .anticon > .menu-icon {
|
1523
|
+
.pro-step > .pro-step-menu > .anticon > .pro-step-menu-icon {
|
1524
1524
|
width: auto !important;
|
1525
1525
|
height: auto !important;
|
1526
1526
|
font-size: var(--zaui-font-size-lg-title, 24px);
|
1527
1527
|
fill: var(--zaui-brand, #006aff);
|
1528
1528
|
}
|
1529
|
-
.pro-step > .step-menu > .anticon > .menu-icon > div {
|
1529
|
+
.pro-step > .pro-step-menu > .anticon > .pro-step-menu-icon > div {
|
1530
1530
|
display: -webkit-box;
|
1531
1531
|
display: -webkit-flex;
|
1532
1532
|
display: -ms-flexbox;
|
@@ -1542,17 +1542,17 @@
|
|
1542
1542
|
width: 48px;
|
1543
1543
|
height: 24px;
|
1544
1544
|
}
|
1545
|
-
.pro-step > .step-menu > .anticon > button {
|
1545
|
+
.pro-step > .pro-step-menu > .anticon > button {
|
1546
1546
|
width: auto !important;
|
1547
1547
|
height: auto !important;
|
1548
1548
|
}
|
1549
|
-
.pro-step > .step-menu > .anticon > button > .menu-icon {
|
1549
|
+
.pro-step > .pro-step-menu > .anticon > button > .pro-step-menu-icon {
|
1550
1550
|
width: auto !important;
|
1551
1551
|
height: auto !important;
|
1552
1552
|
font-size: var(--zaui-font-size-lg-title, 24px);
|
1553
1553
|
fill: var(--zaui-brand, #006aff);
|
1554
1554
|
}
|
1555
|
-
.pro-step > .step-menu > .anticon > button > .menu-icon > div {
|
1555
|
+
.pro-step > .pro-step-menu > .anticon > button > .pro-step-menu-icon > div {
|
1556
1556
|
display: -webkit-box;
|
1557
1557
|
display: -webkit-flex;
|
1558
1558
|
display: -ms-flexbox;
|
@@ -1568,11 +1568,11 @@
|
|
1568
1568
|
width: 48px;
|
1569
1569
|
height: 24px;
|
1570
1570
|
}
|
1571
|
-
.pro-step > .step-menu > .menu-icon {
|
1571
|
+
.pro-step > .pro-step-menu > .menu-icon {
|
1572
1572
|
font-size: var(--zaui-font-size-lg-title, 24px);
|
1573
1573
|
fill: var(--zaui-brand, #006aff);
|
1574
1574
|
}
|
1575
|
-
.pro-step > .step-menu > .menu-icon > div {
|
1575
|
+
.pro-step > .pro-step-menu > .menu-icon > div {
|
1576
1576
|
display: -webkit-box;
|
1577
1577
|
display: -webkit-flex;
|
1578
1578
|
display: -ms-flexbox;
|
@@ -1588,13 +1588,13 @@
|
|
1588
1588
|
width: 48px;
|
1589
1589
|
height: 24px;
|
1590
1590
|
}
|
1591
|
-
.pro-step .menu-content {
|
1591
|
+
.pro-step .pro-step-menu-content {
|
1592
1592
|
overflow: hidden;
|
1593
1593
|
}
|
1594
|
-
.pro-step .menu-content:hover {
|
1594
|
+
.pro-step .pro-step-menu-content:hover {
|
1595
1595
|
overflow-y: auto;
|
1596
1596
|
}
|
1597
|
-
.pro-step .com-menu-item {
|
1597
|
+
.pro-step .pro-step-com-menu-item {
|
1598
1598
|
display: -webkit-box;
|
1599
1599
|
display: -webkit-flex;
|
1600
1600
|
display: -ms-flexbox;
|
@@ -1611,16 +1611,16 @@
|
|
1611
1611
|
height: 48px;
|
1612
1612
|
padding-right: var(--zaui-space-size-md, 24px);
|
1613
1613
|
}
|
1614
|
-
.pro-step .com-menu-item:hover {
|
1614
|
+
.pro-step .pro-step-com-menu-item:hover {
|
1615
1615
|
background-color: rgba(185, 185, 189, 0.1);
|
1616
1616
|
}
|
1617
|
-
.pro-step .com-menu-item.current {
|
1617
|
+
.pro-step .pro-step-com-menu-item.current {
|
1618
1618
|
background-color: var(--ant-primary-1, #e6f4ff);
|
1619
1619
|
}
|
1620
|
-
.pro-step .com-menu-item.current:hover {
|
1620
|
+
.pro-step .pro-step-com-menu-item.current:hover {
|
1621
1621
|
background-color: var(--ant-primary-1, #e6f4ff);
|
1622
1622
|
}
|
1623
|
-
.pro-step .com-menu-item > .menu-item {
|
1623
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item {
|
1624
1624
|
display: -webkit-box;
|
1625
1625
|
display: -webkit-flex;
|
1626
1626
|
display: -ms-flexbox;
|
@@ -1630,7 +1630,7 @@
|
|
1630
1630
|
-ms-flex-align: center;
|
1631
1631
|
align-items: center;
|
1632
1632
|
}
|
1633
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon {
|
1633
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon {
|
1634
1634
|
display: -webkit-box;
|
1635
1635
|
display: -webkit-flex;
|
1636
1636
|
display: -ms-flexbox;
|
@@ -1646,24 +1646,27 @@
|
|
1646
1646
|
width: 48px;
|
1647
1647
|
height: 100%;
|
1648
1648
|
}
|
1649
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > svg {
|
1649
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > svg {
|
1650
1650
|
fill: var(--zaui-brand, #006aff);
|
1651
1651
|
}
|
1652
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > .dot {
|
1652
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > .pro-step-dot {
|
1653
1653
|
width: 6px;
|
1654
1654
|
height: 6px;
|
1655
1655
|
background: var(--zaui-brand, #006aff);
|
1656
1656
|
border-radius: 3px;
|
1657
1657
|
}
|
1658
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > .dot.errored {
|
1658
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > .pro-step-dot.errored {
|
1659
|
+
width: 12px;
|
1660
|
+
height: 12px;
|
1659
1661
|
background: #ff5050;
|
1662
|
+
border-radius: 50%;
|
1660
1663
|
fill: #ff5050;
|
1661
1664
|
}
|
1662
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > .dot.disabled {
|
1665
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > .pro-step-dot.disabled {
|
1663
1666
|
background: #939599;
|
1664
1667
|
fill: #939599;
|
1665
1668
|
}
|
1666
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon .dot-icon {
|
1669
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon .pro-step-dot-icon {
|
1667
1670
|
display: -webkit-box;
|
1668
1671
|
display: -webkit-flex;
|
1669
1672
|
display: -ms-flexbox;
|
@@ -1683,27 +1686,27 @@
|
|
1683
1686
|
background: var(--zaui-brand, #006aff);
|
1684
1687
|
border-radius: 9px;
|
1685
1688
|
}
|
1686
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon .dot-icon.errored {
|
1689
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon .pro-step-dot-icon.errored {
|
1687
1690
|
background: #ff5050;
|
1688
1691
|
fill: #ff5050;
|
1689
1692
|
}
|
1690
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon .dot-icon.disabled {
|
1693
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon .pro-step-dot-icon.disabled {
|
1691
1694
|
background: #939599;
|
1692
1695
|
fill: #939599;
|
1693
1696
|
}
|
1694
|
-
.pro-step .com-menu-item > .menu-item > .menu-name {
|
1697
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-name {
|
1695
1698
|
color: #0a0a0a;
|
1696
1699
|
}
|
1697
|
-
.pro-step .com-menu-item > .menu-item > .menu-name.disabled {
|
1700
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-name.disabled {
|
1698
1701
|
color: #626366;
|
1699
1702
|
}
|
1700
|
-
.pro-step .com-menu-item > .checked-status {
|
1703
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status {
|
1701
1704
|
height: 18px;
|
1702
1705
|
}
|
1703
|
-
.pro-step .com-menu-item > .checked-status > svg {
|
1706
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status > svg {
|
1704
1707
|
fill: var(--zaui-brand, #006aff);
|
1705
1708
|
}
|
1706
|
-
.pro-step .com-menu-item > .checked-status .
|
1709
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot {
|
1707
1710
|
display: -webkit-box;
|
1708
1711
|
display: -webkit-flex;
|
1709
1712
|
display: -ms-flexbox;
|
@@ -1716,12 +1719,16 @@
|
|
1716
1719
|
-webkit-justify-content: center;
|
1717
1720
|
-ms-flex-pack: center;
|
1718
1721
|
justify-content: center;
|
1719
|
-
width: 16px;
|
1720
|
-
height: 16px;
|
1721
|
-
background: rgba(255, 80, 80, 0.2);
|
1722
|
-
border-radius: 8px;
|
1723
1722
|
}
|
1724
|
-
.pro-step .com-menu-item > .checked-status .
|
1723
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot .ant-badge .ant-badge-count {
|
1724
|
+
background: rgba(255, 80, 80, 0.15);
|
1725
|
+
color: #ff5050;
|
1726
|
+
}
|
1727
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot .ant-badge .ant-badge-count .ant-scroll-number-only-unit,
|
1728
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot .ant-badge .ant-badge-count .ant-scroll-number {
|
1729
|
+
font-weight: 600;
|
1730
|
+
}
|
1731
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot > span {
|
1725
1732
|
color: #ff5050;
|
1726
1733
|
font-weight: 600;
|
1727
1734
|
font-size: var(--aui-font-size-sm, 12px);
|
@@ -2235,6 +2242,9 @@
|
|
2235
2242
|
.pro-table .ant-table-summary {
|
2236
2243
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
2237
2244
|
}
|
2245
|
+
.pro-table .ant-table-summary td {
|
2246
|
+
padding: calc(4px + var(--zaui-size)*8px);
|
2247
|
+
}
|
2238
2248
|
.pro-table .ant-table-summary .ant-table-cell {
|
2239
2249
|
font-weight: 500;
|
2240
2250
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
@@ -4622,6 +4632,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
|
|
4622
4632
|
color: var(--zaui-text, #343434);
|
4623
4633
|
font-weight: 600;
|
4624
4634
|
}
|
4635
|
+
.pro-edit-table .ant-table-content > table .ant-table-summary td {
|
4636
|
+
padding: 8px 16px;
|
4637
|
+
}
|
4625
4638
|
.pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
|
4626
4639
|
.pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
|
4627
4640
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
package/dist/less.esm.css
CHANGED
@@ -1490,7 +1490,7 @@
|
|
1490
1490
|
-webkit-transition: width 0.2s;
|
1491
1491
|
transition: width 0.2s;
|
1492
1492
|
}
|
1493
|
-
.pro-step > .step-menu {
|
1493
|
+
.pro-step > .pro-step-menu {
|
1494
1494
|
display: -webkit-box;
|
1495
1495
|
display: -webkit-flex;
|
1496
1496
|
display: -ms-flexbox;
|
@@ -1504,7 +1504,7 @@
|
|
1504
1504
|
font-size: var(--zaui-font-size-lg, 16px);
|
1505
1505
|
border-bottom: 1px solid var(--zaui-line, #dddddd);
|
1506
1506
|
}
|
1507
|
-
.pro-step > .step-menu > .anticon {
|
1507
|
+
.pro-step > .pro-step-menu > .anticon {
|
1508
1508
|
display: -webkit-box;
|
1509
1509
|
display: -webkit-flex;
|
1510
1510
|
display: -ms-flexbox;
|
@@ -1520,13 +1520,13 @@
|
|
1520
1520
|
width: 48px;
|
1521
1521
|
height: 24px;
|
1522
1522
|
}
|
1523
|
-
.pro-step > .step-menu > .anticon > .menu-icon {
|
1523
|
+
.pro-step > .pro-step-menu > .anticon > .pro-step-menu-icon {
|
1524
1524
|
width: auto !important;
|
1525
1525
|
height: auto !important;
|
1526
1526
|
font-size: var(--zaui-font-size-lg-title, 24px);
|
1527
1527
|
fill: var(--zaui-brand, #006aff);
|
1528
1528
|
}
|
1529
|
-
.pro-step > .step-menu > .anticon > .menu-icon > div {
|
1529
|
+
.pro-step > .pro-step-menu > .anticon > .pro-step-menu-icon > div {
|
1530
1530
|
display: -webkit-box;
|
1531
1531
|
display: -webkit-flex;
|
1532
1532
|
display: -ms-flexbox;
|
@@ -1542,17 +1542,17 @@
|
|
1542
1542
|
width: 48px;
|
1543
1543
|
height: 24px;
|
1544
1544
|
}
|
1545
|
-
.pro-step > .step-menu > .anticon > button {
|
1545
|
+
.pro-step > .pro-step-menu > .anticon > button {
|
1546
1546
|
width: auto !important;
|
1547
1547
|
height: auto !important;
|
1548
1548
|
}
|
1549
|
-
.pro-step > .step-menu > .anticon > button > .menu-icon {
|
1549
|
+
.pro-step > .pro-step-menu > .anticon > button > .pro-step-menu-icon {
|
1550
1550
|
width: auto !important;
|
1551
1551
|
height: auto !important;
|
1552
1552
|
font-size: var(--zaui-font-size-lg-title, 24px);
|
1553
1553
|
fill: var(--zaui-brand, #006aff);
|
1554
1554
|
}
|
1555
|
-
.pro-step > .step-menu > .anticon > button > .menu-icon > div {
|
1555
|
+
.pro-step > .pro-step-menu > .anticon > button > .pro-step-menu-icon > div {
|
1556
1556
|
display: -webkit-box;
|
1557
1557
|
display: -webkit-flex;
|
1558
1558
|
display: -ms-flexbox;
|
@@ -1568,11 +1568,11 @@
|
|
1568
1568
|
width: 48px;
|
1569
1569
|
height: 24px;
|
1570
1570
|
}
|
1571
|
-
.pro-step > .step-menu > .menu-icon {
|
1571
|
+
.pro-step > .pro-step-menu > .menu-icon {
|
1572
1572
|
font-size: var(--zaui-font-size-lg-title, 24px);
|
1573
1573
|
fill: var(--zaui-brand, #006aff);
|
1574
1574
|
}
|
1575
|
-
.pro-step > .step-menu > .menu-icon > div {
|
1575
|
+
.pro-step > .pro-step-menu > .menu-icon > div {
|
1576
1576
|
display: -webkit-box;
|
1577
1577
|
display: -webkit-flex;
|
1578
1578
|
display: -ms-flexbox;
|
@@ -1588,13 +1588,13 @@
|
|
1588
1588
|
width: 48px;
|
1589
1589
|
height: 24px;
|
1590
1590
|
}
|
1591
|
-
.pro-step .menu-content {
|
1591
|
+
.pro-step .pro-step-menu-content {
|
1592
1592
|
overflow: hidden;
|
1593
1593
|
}
|
1594
|
-
.pro-step .menu-content:hover {
|
1594
|
+
.pro-step .pro-step-menu-content:hover {
|
1595
1595
|
overflow-y: auto;
|
1596
1596
|
}
|
1597
|
-
.pro-step .com-menu-item {
|
1597
|
+
.pro-step .pro-step-com-menu-item {
|
1598
1598
|
display: -webkit-box;
|
1599
1599
|
display: -webkit-flex;
|
1600
1600
|
display: -ms-flexbox;
|
@@ -1611,16 +1611,16 @@
|
|
1611
1611
|
height: 48px;
|
1612
1612
|
padding-right: var(--zaui-space-size-md, 24px);
|
1613
1613
|
}
|
1614
|
-
.pro-step .com-menu-item:hover {
|
1614
|
+
.pro-step .pro-step-com-menu-item:hover {
|
1615
1615
|
background-color: rgba(185, 185, 189, 0.1);
|
1616
1616
|
}
|
1617
|
-
.pro-step .com-menu-item.current {
|
1617
|
+
.pro-step .pro-step-com-menu-item.current {
|
1618
1618
|
background-color: var(--ant-primary-1, #e6f4ff);
|
1619
1619
|
}
|
1620
|
-
.pro-step .com-menu-item.current:hover {
|
1620
|
+
.pro-step .pro-step-com-menu-item.current:hover {
|
1621
1621
|
background-color: var(--ant-primary-1, #e6f4ff);
|
1622
1622
|
}
|
1623
|
-
.pro-step .com-menu-item > .menu-item {
|
1623
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item {
|
1624
1624
|
display: -webkit-box;
|
1625
1625
|
display: -webkit-flex;
|
1626
1626
|
display: -ms-flexbox;
|
@@ -1630,7 +1630,7 @@
|
|
1630
1630
|
-ms-flex-align: center;
|
1631
1631
|
align-items: center;
|
1632
1632
|
}
|
1633
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon {
|
1633
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon {
|
1634
1634
|
display: -webkit-box;
|
1635
1635
|
display: -webkit-flex;
|
1636
1636
|
display: -ms-flexbox;
|
@@ -1646,24 +1646,27 @@
|
|
1646
1646
|
width: 48px;
|
1647
1647
|
height: 100%;
|
1648
1648
|
}
|
1649
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > svg {
|
1649
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > svg {
|
1650
1650
|
fill: var(--zaui-brand, #006aff);
|
1651
1651
|
}
|
1652
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > .dot {
|
1652
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > .pro-step-dot {
|
1653
1653
|
width: 6px;
|
1654
1654
|
height: 6px;
|
1655
1655
|
background: var(--zaui-brand, #006aff);
|
1656
1656
|
border-radius: 3px;
|
1657
1657
|
}
|
1658
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > .dot.errored {
|
1658
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > .pro-step-dot.errored {
|
1659
|
+
width: 12px;
|
1660
|
+
height: 12px;
|
1659
1661
|
background: #ff5050;
|
1662
|
+
border-radius: 50%;
|
1660
1663
|
fill: #ff5050;
|
1661
1664
|
}
|
1662
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon > .dot.disabled {
|
1665
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon > .pro-step-dot.disabled {
|
1663
1666
|
background: #939599;
|
1664
1667
|
fill: #939599;
|
1665
1668
|
}
|
1666
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon .dot-icon {
|
1669
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon .pro-step-dot-icon {
|
1667
1670
|
display: -webkit-box;
|
1668
1671
|
display: -webkit-flex;
|
1669
1672
|
display: -ms-flexbox;
|
@@ -1683,27 +1686,27 @@
|
|
1683
1686
|
background: var(--zaui-brand, #006aff);
|
1684
1687
|
border-radius: 9px;
|
1685
1688
|
}
|
1686
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon .dot-icon.errored {
|
1689
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon .pro-step-dot-icon.errored {
|
1687
1690
|
background: #ff5050;
|
1688
1691
|
fill: #ff5050;
|
1689
1692
|
}
|
1690
|
-
.pro-step .com-menu-item > .menu-item > .menu-icon .dot-icon.disabled {
|
1693
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-icon .pro-step-dot-icon.disabled {
|
1691
1694
|
background: #939599;
|
1692
1695
|
fill: #939599;
|
1693
1696
|
}
|
1694
|
-
.pro-step .com-menu-item > .menu-item > .menu-name {
|
1697
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-name {
|
1695
1698
|
color: #0a0a0a;
|
1696
1699
|
}
|
1697
|
-
.pro-step .com-menu-item > .menu-item > .menu-name.disabled {
|
1700
|
+
.pro-step .pro-step-com-menu-item > .pro-step-menu-item > .pro-step-menu-name.disabled {
|
1698
1701
|
color: #626366;
|
1699
1702
|
}
|
1700
|
-
.pro-step .com-menu-item > .checked-status {
|
1703
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status {
|
1701
1704
|
height: 18px;
|
1702
1705
|
}
|
1703
|
-
.pro-step .com-menu-item > .checked-status > svg {
|
1706
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status > svg {
|
1704
1707
|
fill: var(--zaui-brand, #006aff);
|
1705
1708
|
}
|
1706
|
-
.pro-step .com-menu-item > .checked-status .
|
1709
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot {
|
1707
1710
|
display: -webkit-box;
|
1708
1711
|
display: -webkit-flex;
|
1709
1712
|
display: -ms-flexbox;
|
@@ -1716,12 +1719,16 @@
|
|
1716
1719
|
-webkit-justify-content: center;
|
1717
1720
|
-ms-flex-pack: center;
|
1718
1721
|
justify-content: center;
|
1719
|
-
width: 16px;
|
1720
|
-
height: 16px;
|
1721
|
-
background: rgba(255, 80, 80, 0.2);
|
1722
|
-
border-radius: 8px;
|
1723
1722
|
}
|
1724
|
-
.pro-step .com-menu-item > .checked-status .
|
1723
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot .ant-badge .ant-badge-count {
|
1724
|
+
background: rgba(255, 80, 80, 0.15);
|
1725
|
+
color: #ff5050;
|
1726
|
+
}
|
1727
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot .ant-badge .ant-badge-count .ant-scroll-number-only-unit,
|
1728
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot .ant-badge .ant-badge-count .ant-scroll-number {
|
1729
|
+
font-weight: 600;
|
1730
|
+
}
|
1731
|
+
.pro-step .pro-step-com-menu-item > .pro-step-checked-status .pro-step-error-dot > span {
|
1725
1732
|
color: #ff5050;
|
1726
1733
|
font-weight: 600;
|
1727
1734
|
font-size: var(--aui-font-size-sm, 12px);
|
@@ -2235,6 +2242,9 @@
|
|
2235
2242
|
.pro-table .ant-table-summary {
|
2236
2243
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
2237
2244
|
}
|
2245
|
+
.pro-table .ant-table-summary td {
|
2246
|
+
padding: calc(4px + var(--zaui-size)*8px);
|
2247
|
+
}
|
2238
2248
|
.pro-table .ant-table-summary .ant-table-cell {
|
2239
2249
|
font-weight: 500;
|
2240
2250
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
@@ -4622,6 +4632,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
|
|
4622
4632
|
color: var(--zaui-text, #343434);
|
4623
4633
|
font-weight: 600;
|
4624
4634
|
}
|
4635
|
+
.pro-edit-table .ant-table-content > table .ant-table-summary td {
|
4636
|
+
padding: 8px 16px;
|
4637
|
+
}
|
4625
4638
|
.pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
|
4626
4639
|
.pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
|
4627
4640
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
@@ -10,7 +10,7 @@ interface Props {
|
|
10
10
|
namesStr?: NamePath;
|
11
11
|
originalValues?: any;
|
12
12
|
form: FormInstance;
|
13
|
-
|
13
|
+
onDiff?: DiffOriginalParams['onDiff'];
|
14
14
|
[name: string]: any;
|
15
15
|
}
|
16
16
|
declare const ListChangedWrapper: React.FC<Props>;
|
@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
|
|
5
5
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
7
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
8
|
-
var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "
|
8
|
+
var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
|
9
9
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
10
10
|
import React, { useMemo } from 'react';
|
11
11
|
import classnames from 'classnames';
|
@@ -84,7 +84,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
|
|
84
84
|
originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
|
85
85
|
originalValues = props.originalValues,
|
86
86
|
form = props.form,
|
87
|
-
|
87
|
+
onDiff = props.onDiff,
|
88
88
|
rowKeyPath = props.rowKeyPath,
|
89
89
|
children = props.children,
|
90
90
|
type = props.type,
|
@@ -115,7 +115,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
|
|
115
115
|
form: form
|
116
116
|
});
|
117
117
|
var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
|
118
|
-
var noChange = !
|
118
|
+
var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
|
119
119
|
var diffType = useMemo(function () {
|
120
120
|
if (!isWatch || noChange) return 'same';
|
121
121
|
var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
|
@@ -130,7 +130,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
|
|
130
130
|
value: _value,
|
131
131
|
originalValue: _originalValue,
|
132
132
|
form: form,
|
133
|
-
|
133
|
+
onDiff: onDiff,
|
134
134
|
originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
|
135
135
|
record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
|
136
136
|
index: index
|
@@ -568,9 +568,10 @@ var RenderField = function RenderField(_ref) {
|
|
568
568
|
originalNames: originalNames,
|
569
569
|
originalValues: originalValues,
|
570
570
|
form: form,
|
571
|
-
|
571
|
+
onDiff: onDiff,
|
572
572
|
type: type,
|
573
573
|
onChange: _onChange,
|
574
|
+
onBlur: _onblur,
|
574
575
|
valuePropName: _formItemProps.valuePropName,
|
575
576
|
normalize: _formItemProps.normalize,
|
576
577
|
getValueProps: _formItemProps.getValueProps,
|
package/es/ProEditTable/index.js
CHANGED
@@ -2,6 +2,8 @@ import "antd/es/affix/style";
|
|
2
2
|
import _Affix from "antd/es/affix";
|
3
3
|
import _typeof from "@babel/runtime/helpers/esm/typeof";
|
4
4
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
5
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
6
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
5
7
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
6
8
|
import "antd/es/config-provider/style";
|
7
9
|
import _ConfigProvider from "antd/es/config-provider";
|
@@ -16,7 +18,7 @@ import { get, isArray, isBoolean, set } from 'lodash';
|
|
16
18
|
import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks';
|
17
19
|
import classnames from 'classnames';
|
18
20
|
import { transformColumns } from './utils';
|
19
|
-
import { getRandom, getNamePath } from './utils/tools';
|
21
|
+
import { getRandom, getNamePath, handleScrollToError } from './utils/tools';
|
20
22
|
import { Validator, Summary, RenderToolbar } from './components';
|
21
23
|
import ProForm from '../ProForm';
|
22
24
|
import Empty from '../assets/empty.png';
|
@@ -160,6 +162,40 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
160
162
|
return getRowKey(item) === getRowKey(record);
|
161
163
|
}));
|
162
164
|
};
|
165
|
+
// 分页变更
|
166
|
+
var handlePageChange = useCallback(/*#__PURE__*/function () {
|
167
|
+
var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
|
168
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
169
|
+
while (1) switch (_context.prev = _context.next) {
|
170
|
+
case 0:
|
171
|
+
_context.prev = 0;
|
172
|
+
_context.next = 3;
|
173
|
+
return form.validateFields([name], {
|
174
|
+
recursive: true
|
175
|
+
});
|
176
|
+
case 3:
|
177
|
+
setState({
|
178
|
+
page: {
|
179
|
+
pageNum: current,
|
180
|
+
pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
|
181
|
+
}
|
182
|
+
});
|
183
|
+
_context.next = 9;
|
184
|
+
break;
|
185
|
+
case 6:
|
186
|
+
_context.prev = 6;
|
187
|
+
_context.t0 = _context["catch"](0);
|
188
|
+
handleScrollToError();
|
189
|
+
case 9:
|
190
|
+
case "end":
|
191
|
+
return _context.stop();
|
192
|
+
}
|
193
|
+
}, _callee, null, [[0, 6]]);
|
194
|
+
}));
|
195
|
+
return function (_x, _x2) {
|
196
|
+
return _ref4.apply(this, arguments);
|
197
|
+
};
|
198
|
+
}(), []);
|
163
199
|
var config = _objectSpread({
|
164
200
|
form: form,
|
165
201
|
mode: mode,
|
@@ -194,7 +230,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
194
230
|
rowDisabled: rowDisabled,
|
195
231
|
actionDirection: actionDirection,
|
196
232
|
diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
|
197
|
-
getIsNew: getIsNew
|
233
|
+
getIsNew: getIsNew,
|
234
|
+
handlePageChange: handlePageChange
|
198
235
|
}, resetProps);
|
199
236
|
// 编辑行设置下样式
|
200
237
|
var _rowClassName = function _rowClassName(record) {
|
@@ -245,15 +282,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
|
|
245
282
|
},
|
246
283
|
hideSelectAll: isHideCheckBox
|
247
284
|
}, rowSelection);
|
248
|
-
// 分页变更
|
249
|
-
var handlePageChange = useCallback(function (current, pageSize) {
|
250
|
-
setState({
|
251
|
-
page: {
|
252
|
-
pageNum: current,
|
253
|
-
pageSize: pageSize
|
254
|
-
}
|
255
|
-
});
|
256
|
-
}, []);
|
257
285
|
// 空列表状态
|
258
286
|
var empty = function empty() {
|
259
287
|
var _toolbarProps$filter;
|
@@ -110,7 +110,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
|
|
110
110
|
rules?: ProRule[] | RulesFn<T>;
|
111
111
|
confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
|
112
112
|
dependencies?: NamePath[];
|
113
|
-
onDiff?: DiffOriginalParams['
|
113
|
+
onDiff?: DiffOriginalParams['onDiff'];
|
114
114
|
[key: string]: any;
|
115
115
|
}
|
116
116
|
export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
|
@@ -151,7 +151,9 @@
|
|
151
151
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
152
152
|
color : var(--zaui-text, #343434);
|
153
153
|
font-weight : 600;
|
154
|
-
|
154
|
+
td{
|
155
|
+
padding: 8px 16px;
|
156
|
+
}
|
155
157
|
.@{ant-prefix}-table-cell-fix-left,
|
156
158
|
.@{ant-prefix}-table-cell-fix-right {
|
157
159
|
background-color: var(--zaui-table-header-bg, #f2f3f5);
|
@@ -20,6 +20,6 @@ export declare const actions: {
|
|
20
20
|
save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
|
21
21
|
cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
|
22
22
|
delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
|
23
|
-
add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, }: any) => Promise<boolean>;
|
23
|
+
add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, page, handlePageChange, }: any) => Promise<boolean>;
|
24
24
|
mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;
|
25
25
|
};
|
@@ -7,6 +7,7 @@ import "antd/es/message/style";
|
|
7
7
|
import _message from "antd/es/message";
|
8
8
|
import { jsx as _jsx } from "react/jsx-runtime";
|
9
9
|
import { PlusOutlined } from '@ant-design/icons';
|
10
|
+
import { tools } from '@zat-design/utils';
|
10
11
|
import { set } from 'lodash';
|
11
12
|
import { onDelete, getRandom } from './tools';
|
12
13
|
import locale from '../../locale';
|
@@ -168,11 +169,11 @@ export var actions = {
|
|
168
169
|
add: function () {
|
169
170
|
var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
|
170
171
|
var _tableRef$current$que, _tableRef$current$que2;
|
171
|
-
var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
|
172
|
+
var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
|
172
173
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
173
174
|
while (1) switch (_context2.prev = _context2.next) {
|
174
175
|
case 0:
|
175
|
-
result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls;
|
176
|
+
result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
|
176
177
|
nextData = _toConsumableArray(form.getFieldValue(name) || []); // 单行编辑时,需要先保存,才能进行下面的编辑
|
177
178
|
if (!(virtualKey && editingKeys.length >= 1)) {
|
178
179
|
_context2.next = 5;
|
@@ -189,7 +190,14 @@ export var actions = {
|
|
189
190
|
addData.addFlag = true;
|
190
191
|
addData.isEditing = true;
|
191
192
|
}
|
192
|
-
insertType === 'before'
|
193
|
+
if (insertType === 'before') {
|
194
|
+
nextData.unshift(addData);
|
195
|
+
handlePageChange(1);
|
196
|
+
} else {
|
197
|
+
nextData.push(addData);
|
198
|
+
nextPageNum = Math.ceil(tools.calc(nextData.length, '/', page.pageSize));
|
199
|
+
handlePageChange(nextPageNum);
|
200
|
+
}
|
193
201
|
// 当单选情况下,存储正在编辑值
|
194
202
|
if (virtualKey) {
|
195
203
|
nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态
|
@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
|
|
4
4
|
originalValue: any;
|
5
5
|
value: any;
|
6
6
|
form: FormInstance;
|
7
|
-
|
7
|
+
onDiff?: ({ originValue, originRecord, value, record, index, }: {
|
8
8
|
originValue: any;
|
9
9
|
originRecord: any;
|
10
10
|
value: any;
|