@bit-sun/business-component 4.0.13-alpha.3 → 4.0.13-alpha.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.13-alpha.3",
+  "version": "4.0.13-alpha.30",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,6 +53,7 @@
     "querystring": "^0.2.1",
     "react": "^16.12.0",
     "react-beautiful-dnd": "10.0.0",
+    "react-dom": "^16.12.0",
     "react-resizable": "^3.0.4",
     "react-sortable-hoc": "^2.0.0",
     "serialize-javascript": "^6.0.0",

package/src/assets/btn-cancel.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M13.0151021,14.4269183 L14.851,16.345 L16.7185097,14.458311 L17.5242651,15.3033815 L15.658,17.189 L17.3956835,19.0040241 L16.5899281,19.8189135 L14.847,18.009 L13.0004688,19.876736 L12.1947134,19.0316656 L14.037,17.168 L12.2093467,15.2719887 L13.0151021,14.4269183 Z M12.0143885,5 C12.2446043,5 12.4460432,5.09054326 12.618705,5.27162978 L16.9640288,9.79879276 C17.1366906,9.97987928 17.2230216,10.1911469 17.2230216,10.4325956 L17.2230216,13.4312601 L16.0719424,13.4312601 L16.071,10.949 L12.4172662,10.9758551 C12.1870504,10.9758551 11.9568345,10.8853119 11.7841727,10.7042254 C11.6115108,10.5231388 11.5251799,10.2816901 11.5251799,10.0402414 L11.525,6.237 L7.17985612,6.23742455 L7.17985612,18.1287726 L10.9496403,18.1287726 L10.9496403,19.3360161 L6.86330935,19.3360161 C6.4028777,19.3360161 6,18.943662 6,18.4305835 L6,5.9054326 C6,5.42253521 6.37410072,5 6.86330935,5 L12.0143885,5 Z M12.676259,7.08249497 L12.676259,9.76861167 L15.2086331,9.73843058 L12.676259,7.08249497 Z" fill="#040000" fill-rule="nonzero"></path>
+</svg>

package/src/assets/btn-copy.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M17.0909091,5 L17.9987273,5.00011112 C18.5509686,5.00011112 18.9986659,5.44775865 18.9987273,6.00000001 L19,15.4545455 C19.0000614,16.0068302 18.5523959,16.4545952 18.0001111,16.4546566 C18.0000741,16.4546566 18.000037,16.4546566 18,16.4546566 L17.1625,16.4545455 L17.1625,16.4545455 L17.0909091,16.4545455 L16.4545455,16.4545455 L16.4545455,18 C16.4545455,18.5522847 16.0068302,19 15.4545455,19 L14.6170455,19 L14.6170455,19 L14.5454546,19 L6.90909091,19 L6,19 C5.44771525,19 5,18.5522847 5,18 L5,9.45454545 L5,9.45454545 L5,8.54545454 C5,7.99316979 5.44771525,7.54545454 6,7.54545454 L7.54545454,7.54545454 L7.54545454,7.54545454 L7.54545454,6 C7.54545454,5.44771525 7.99316979,5 8.54545454,5 L9.38295454,5 L9.38295454,5 L9.45454545,5 L17.0909091,5 Z M14.5454546,8.68691666 L6.90909091,8.68691666 L6.16011512,8.68691666 L6.16011512,16.7079008 L6.16011512,17.8735523 L7.16954857,17.8735523 L14.2108223,17.8735523 L15.3188691,17.8735523 L15.3188691,16.7502891 L15.3188691,8.68691666 L14.5454546,8.68691666 Z M13.5909091,14.8636364 L13.5909091,15.5 L7.86363635,15.5 L7.86363635,14.8636364 L7.86363635,14.2272727 L13.5909091,14.2272727 L13.5909091,14.8636364 Z M9.45454545,6.07289387 L8.72541673,6.07289387 L8.72382583,7.54545454 L15.4545455,7.54545454 C16.0068302,7.54545454 16.4545455,7.99316979 16.4545455,8.54545454 L16.4545455,9.38295454 L16.4545455,9.38295454 L16.4545455,9.45454545 L16.4545455,15.1818184 L17.0909091,15.1818184 L17.8806016,15.1818184 L17.8821925,6.07289387 L9.45454545,6.07289387 Z M13.5057337,11.3636082 L13.5057337,12.0000281 L13.5057337,12.3181818 L7.94881173,12.3181818 L7.94881173,12.0000281 L7.94881173,11.3636082 L7.94881173,11.0454545 L13.5057337,11.0454545 L13.5057337,11.3636082 Z" fill="#2E3033" fill-rule="nonzero"></path>
+</svg>

package/src/assets/btn-delete.svg

@@ -1,30 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>筛选-状态一备份 2</title>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="20" height="20"></rect>
-    </defs>
-    <g id="顶部导航" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="最新框架-下拉式展开" transform="translate(-1665.000000, -94.000000)">
-            <g id="编组-7" transform="translate(160.000000, 50.000000)">
-                <g id="tab导航备份-7" transform="translate(0.000000, 26.000000)">
-                    <g id="编组-10" transform="translate(1339.000000, 12.000000)">
-                        <g id="搜索三件套备份-5" transform="translate(156.000000, 0.000000)">
-                            <g id="筛选-状态一" transform="translate(10.000000, 6.000000)">
-                                <mask id="mask-2" fill="white">
-                                    <use xlink:href="#path-1"></use>
-                                </mask>
-                                <use id="蒙版" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use>
-                                <g id="编组" mask="url(#mask-2)" fill="#FFFFFF" fill-rule="nonzero">
-                                    <g transform="translate(4.000000, 3.000000)" id="形状">
-                                        <path d="M2.994,4.13446555 L3.51440001,11.7596603 L8.6112,11.7596603 L9.13120001,4.13446555 L10.3332,4.13446555 L9.80800001,11.8468976 C9.76369693,12.4963619 9.24110169,12.9998762 8.6112,13 L3.51440001,13 C2.88435477,12.9998609 2.36170317,12.4961118 2.31760001,11.8464841 L1.7916,4.13446555 L2.994,4.13446555 Z M5.60600001,4.51855739 L5.60600001,10.3068092 L4.40600001,10.3068092 L4.40600001,4.51855739 L5.60600001,4.51855739 Z M7.8,4.51855739 L7.8,10.3068092 L6.6,10.3068092 L6.6,4.51855739 L7.8,4.51855739 Z M0,2.06723278 L12,2.06723278 L12,3.30757244 L0,3.30757244 L0,2.06723278 Z M8.50280001,0 L8.50280001,1.24033966 L3.70280001,1.24033966 L3.70280001,0 L8.50280001,0 Z"></path>
-                                    </g>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M15.1363636,4 C15.6886484,4 16.1363636,4.44771525 16.1363636,5 L16.1363636,7.125 L19,7.125 L19,8.375 L17.1292731,8.375 L17.1292731,19 C17.1292731,19.5522847 16.6815579,20 16.1292731,20 L15.5,20 L8.5,20 L7.59090908,20 C7.03862433,20 6.59090908,19.5522847 6.59090908,19 L6.59090908,8.375 L5,8.375 L5,7.125 L7.86363637,7.125 L7.86363637,5 C7.86363637,4.44771525 8.31135162,4 8.86363637,4 Z M15.9375,8.375 L7.8125,8.375 L7.8125,18.75 L15.9375,18.75 L15.9375,8.375 Z M10.9375,10.1875957 L10.9375,17.093797 L9.68749998,17.093797 L9.68749998,10.1875957 L10.9375,10.1875957 Z M14.0625,10.1875957 L14.0625,17.093797 L12.8125,17.093797 L12.8125,10.1875957 L14.0625,10.1875957 Z M14.9222156,5.25 L9.0625,5.25 L9.0625,7.125 L14.9222156,7.125 L14.9222156,5.25 Z" fill="#3E3E3E" fill-rule="nonzero"></path>
 </svg>

package/src/assets/btn-edit.svg

@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 9</title>
-    <g id="顶部导航" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="最新框架-下拉式展开" transform="translate(-1509.000000, -94.000000)">
-            <g id="编组-7" transform="translate(160.000000, 50.000000)">
-                <g id="tab导航备份-7" transform="translate(0.000000, 26.000000)">
-                    <g id="编组-10" transform="translate(1339.000000, 12.000000)">
-                        <g id="编组-2" transform="translate(10.000000, 6.000000)">
-                            <rect id="蒙版" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
-                            <g id="编组" transform="translate(3.000000, 4.000000)" fill="#FFFFFF" fill-rule="nonzero">
-                                <path d="M10.389993,0 L10.389993,1.3 L1.27053272,1.3 L1.27053272,10.8333333 L11.4347944,10.8333333 L11.4347944,6.06666667 L12.7053272,6.06666667 L12.7053272,10.8333333 C12.7053272,11.5513035 12.1364903,12.1333333 11.4347944,12.1333333 L1.27053272,12.1333333 C0.568836873,12.1333333 0,11.5513035 0,10.8333333 L0,1.3 C0,0.582029825 0.568836873,0 1.27053272,0 L10.389993,0 Z M13.1046979,0.492266673 L14,1.4144 L7.17639229,8.34686666 L7.17893335,8.34946666 L6.25398553,8.38153334 L6.28024322,7.42126667 L6.28193725,7.42343334 L13.1046979,0.492266673 L13.1046979,0.492266673 Z" id="形状"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M20,18.6652611 L20,19.3979707 L20,20 L4,20 L4,19.3979707 L4,18.6652611 L20,18.6652611 Z M14.2960911,4.17633188 C14.5275784,3.94122271 14.9028913,3.94122271 15.1343622,4.17633188 L17.4163545,6.49402774 C17.6478583,6.72913692 17.6478583,7.11032182 17.4163545,7.345431 L8.43496158,16.4277085 C8.36527571,16.4984893 8.27931305,16.550506 8.18485181,16.579052 L4.93650384,17.560527 C4.48520307,17.6968699 4.06507135,17.2701649 4.19933041,16.8118199 L5.16568606,13.512649 C5.19379224,13.4167098 5.24500766,13.3294022 5.31469813,13.2586261 L14.2960911,4.17633188 Z M20,16.1286246 L20,16.8560691 L20,17.4580984 C19.2791568,17.4580984 18.3492175,17.4580984 17.2101821,17.4580984 C16.0711466,17.4580984 14.1650083,17.4580984 11.4917673,17.4580984 L11.4917673,16.8560691 L11.4917673,16.1286246 L20,16.1286246 Z M6.25913831,14.002149 L5.64777717,16.0893847 L7.70287596,15.4684416 L16.0610272,7.06564268 L14.6173225,5.5993668 L6.25913831,14.002149 Z" fill="#2C2C2C" fill-rule="nonzero"></path>
 </svg>

package/src/assets/btn-hangUp.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M11.7782857,3.00000016 C12.3001619,2.99977385 12.7937223,3.23470832 13.1191658,3.63825843 C13.4446093,4.04180854 13.5664902,4.57002172 13.4502857,5.07328132 L17.112,8.69530544 L18.8571429,8.69530544 C19.1602474,8.69530544 19.4509376,8.81440813 19.6652649,9.02641228 C19.8795922,9.23841643 20,9.52595576 20,9.82577491 L20,18.8695305 C20,19.4938716 19.4883254,20.0000002 18.8571429,20.0000002 L5.14285714,20.0000002 C4.51167457,20.0000002 4,19.4938716 4,18.8695305 L4,9.82577491 C4,9.52595576 4.12040781,9.23841643 4.3347351,9.02641228 C4.54906239,8.81440813 4.83975258,8.69530544 5.14285714,8.69530544 L6.48228571,8.69530544 L10.1131428,5.10267352 C9.98848601,4.59655451 10.1052663,4.06183998 10.4300197,3.65175481 C10.7547732,3.24166964 11.2516566,3.00147521 11.7782857,3.00000016 Z M18.8571429,9.82577491 L5.14285714,9.82577491 L5.14285714,18.8695305 L18.8571429,18.8695305 L18.8571429,9.82577491 Z M6.85714285,16.6085916 C7.17273414,16.6085916 7.42857143,16.8616558 7.42857143,17.1738264 C7.42857143,17.4859969 7.17273414,17.7390611 6.85714285,17.7390611 C6.54155156,17.7390611 6.28571427,17.4859969 6.28571427,17.1738264 C6.28571427,16.8616558 6.54155156,16.6085916 6.85714285,16.6085916 Z M17.1428571,16.6085916 C17.4584484,16.6085916 17.7142857,16.8616558 17.7142857,17.1738264 C17.7142857,17.4859969 17.4584484,17.7390611 17.1428571,17.7390611 C16.8272659,17.7390611 16.5714286,17.4859969 16.5714286,17.1738264 C16.5714286,16.8616558 16.8272659,16.6085916 17.1428571,16.6085916 Z M13.9634286,11.4932173 L14.7714286,12.2924592 L12.7508571,14.2911292 L14.7714286,16.2897992 L13.9634286,17.0890411 L11.9428571,15.0903712 L9.92228571,17.0890411 L9.11428572,16.2897992 L11.1348571,14.2911292 L9.11428572,12.2924592 L9.92228571,11.4932173 L11.9428571,13.4918874 L13.9634286,11.4932173 Z M17.1428571,11.0093764 C17.4584484,11.0093764 17.7142857,11.2624406 17.7142857,11.5746112 C17.7142857,11.8867817 17.4584484,12.1398459 17.1428571,12.1398459 C16.9387054,12.1398459 16.7500614,12.0321128 16.6479855,11.8572285 C16.5459096,11.6823443 16.5459096,11.466878 16.6479855,11.2919938 C16.7500614,11.1171095 16.9387054,11.0093764 17.1428571,11.0093764 Z M6.85714285,10.9562444 C7.17273412,10.9562444 7.42857139,11.2093086 7.42857139,11.5214791 C7.42857139,11.8336496 7.17273412,12.0867138 6.85714285,12.0867138 C6.65299108,12.0867138 6.46434706,11.9789807 6.36227117,11.8040965 C6.26019528,11.6292122 6.26019528,11.413746 6.36227117,11.2388617 C6.46434706,11.0639775 6.65299108,10.9562444 6.85714285,10.9562444 Z M12.8171429,6.04548504 C12.5188904,6.27107685 12.153742,6.39306307 11.7782857,6.39253917 C11.3977143,6.39253917 11.0457143,6.269318 10.7611429,6.06131161 L8.09828571,8.69530544 L15.4948571,8.69530544 L12.8171429,6.04548504 Z" fill="#000" fill-rule="nonzero"></path>
+</svg>

package/src/assets/btn-print.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M9.66666666,13.1666667 L9.66666666,17.8333333 L14.3333333,17.8333333 L14.3333333,13.1666667 L9.66666666,13.1666667 Z M15.5,15.5 L17.8333333,15.5 L17.8333333,9.66666666 L6.16666666,9.66666666 L6.16666666,15.5 L8.5,15.5 L8.5,13.1666667 L7.33342263,13.1666667 L7.33342263,12.5833333 L7.33342263,12 L16.6665774,12 L16.6665774,12.5833333 L16.6665774,13.1666667 L15.5,13.1666667 L15.5,15.5 Z M8.5,16.6666667 L6.16666666,16.6666667 C5.52233446,16.6666667 5,16.1443322 5,15.5 L5,9.66666666 C5,9.02233446 5.52233446,8.5 6.16666666,8.5 L8.5,8.5 L8.5,6.16666666 C8.5,5.52233446 9.02233446,5 9.66666666,5 L14.3333333,5 C14.9776655,5 15.5,5.52233446 15.5,6.16666666 L15.5,8.5 L17.8333333,8.5 C18.4776655,8.5 19,9.02233446 19,9.66666666 L19,15.5 C19,16.1443322 18.4776655,16.6666667 17.8333333,16.6666667 L15.5,16.6666667 L15.5,17.8333333 C15.5,18.4776655 14.9776655,19 14.3333333,19 L9.66666666,19 C9.02233446,19 8.5,18.4776655 8.5,17.8333333 L8.5,16.6666667 Z M14.3333333,8.5 L14.3333333,6.16666666 L9.66666666,6.16666666 L9.66666666,8.5 L14.3333333,8.5 Z" fill="#3E3E3E" fill-rule="nonzero"></path>
+</svg>

package/src/assets/btn-refresh.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M18.94575,11.125 C18.981625,11.4115625 19,11.7038125 19,12 C19,15.8661875 15.8661881,19 12.0000014,19 C10.1362517,19 8.44225205,18.2715625 7.1875023,17.08375 L7.1875023,19 L5.87500256,19 L5.87544006,15.9375 L5.87500256,14.625 L10.2500017,14.625 L10.2500017,15.9375 L7.89625216,15.9375 C8.93137696,17.016375 10.3873767,17.6875 12.0000014,17.6875 C15.1412507,17.6875 17.6875003,15.14125 17.6875003,12 C17.687583,11.7070512 17.665205,11.4145273 17.6205628,11.125 L18.9461875,11.125 L18.94575,11.125 Z M18.1250002,5 L18.1245627,8.06250001 L18.1250002,9.375 L13.750001,9.375 L13.750001,8.06250001 L16.1041881,8.06250001 C15.0327104,6.9428839 13.5497111,6.31054214 12.0000014,6.3125 C8.85875197,6.3125 6.31250247,8.85875 6.31250247,12 C6.31250247,12.2975 6.33525247,12.5901875 6.37943996,12.875 L5.05381521,12.875 C5.01779256,12.5847275 4.99982051,12.2924991 5.00000135,12 C5.00000135,8.1338125 8.13381462,5 12.0000014,5 C13.863751,5 15.5581882,5.72887501 16.8125004,6.91668749 L16.8125004,5 L18.1250002,5 Z" fill="#3E3E3E" fill-rule="nonzero"></path>
+</svg>

package/src/assets/btn-unhook.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="design-iconfont" width="16" height="16">
+  <path d="M12.5311653,14.5508817 L12.5311653,13.2326256 C13.3848238,13.1340808 14.1752484,12.8138102 14.8328817,12.3334044 L15.8699187,13.3434885 L16.7109304,12.5243349 L15.6865402,11.5265689 C16.3757904,10.6889382 16.7741644,9.61110446 16.7299006,8.4470441 C16.6774618,7.32337401 16.3287928,6.21824036 15.4374714,5.33134433 C14.5455357,4.44383708 13.3572314,4.01010691 12,4.00006849 C10.8617886,3.99405125 9.8036016,4.3849051 8.98156004,5.02544626 L7.95302618,4.00636936 L7.11833784,4.8193639 L8.1531951,5.85691795 C7.69418947,6.44248923 7.27225519,7.38404803 7.27225519,8.11644273 C7.79460882,8.20600257 8.14631127,8.25397686 8.54141325,8.32640711 C8.62994081,7.83368313 8.83284993,7.16515696 9.11107938,6.7709778 L13.9539295,11.4772965 C13.5365854,11.7544537 13.0496838,11.9453842 12.5311653,12.0316109 L11.8102981,12.0316109 C11.5826558,12.0316109 11.3929539,12.2163824 11.3929539,12.4381082 L11.3929539,14.5508817 L5.70189702,14.5508817 C5.31616983,14.5631998 5,14.8773113 5,15.2468543 L5,19.3040274 C5,19.6858885 5.32249322,20 5.7145438,20 L18.2854562,20 C18.6775068,20 19,19.6858885 19,19.3040274 L19,15.2468543 C18.9873532,14.8649932 18.66486,14.5508817 18.2791328,14.5508817 L12.5311653,14.5508817 Z M12.2339657,5.20122497 C12.9096339,5.25166385 13.5465163,5.36896496 14.0643728,5.74187871 C14.8744517,6.32522476 15.491468,7.27667119 15.5647596,8.30990061 C15.6279936,9.17216756 15.2818428,10.048397 14.8012647,10.67662 L9.86269195,5.86640232 C10.5203252,5.3921555 11.3486901,5.13963448 12.2339657,5.20122497 Z M17.8491418,18.8081647 L6.15718157,18.8081647 L6.15718157,18.3831903 L6.15718157,16.2686664 L6.15718157,15.843692 L17.8491418,15.843692 L17.8491418,16.2686664 L17.8491418,18.3831903 L17.8491418,18.8081647 Z" fill="#3E3E3E" fill-rule="nonzero"></path>
+</svg>

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -370,7 +370,7 @@ export default (props: any) => {
             }
           });
         }
-        handleBssulaColumnsSpecialParams(d);
+        // handleBssulaColumnsSpecialParams(d);
       });
       setCommonRenderFn(props.columns);
       const authButton = localStorage.getItem(getMenuAuthDataKey())
@@ -405,7 +405,7 @@ export default (props: any) => {
 
     showColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -429,7 +429,7 @@ export default (props: any) => {
 
     showExportColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -552,10 +552,10 @@ export default (props: any) => {
         x: props.overScrollX || 'max-content',
         y: props?.overScrollY || height,
       },
-      bordered: value.bordered || true,
-      sticky: true,
-      rowClassName: (record: object | null | undefined, index: number) =>
-        index % 2 === 0 ? 'table_base' : 'table_odd',
+      bordered: typeof value.bordered == 'boolean' ? value.bordered :  true,
+      sticky: typeof value.sticky == 'boolean' ? value.sticky :  true,
+      rowClassName: props?.rowClassName || tableProps?.rowClassName || ((record: object | null | undefined, index: number) =>
+        index % 2 === 0 ? 'table_base' : 'table_odd'),
       components: {
         header: {
           cell: ResizeableTitle,
@@ -715,9 +715,9 @@ export default (props: any) => {
           ...newColumns[index],
           width: size.width,
         };
-        newColumns.forEach((d: any) => {
-          handleBssulaColumnsSpecialParams(d);
-        });
+        // newColumns.forEach((d: any) => {
+        //   handleBssulaColumnsSpecialParams(d);
+        // });
         return [...newColumns];
       });
     };

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -711,7 +711,7 @@ class SortableTable extends React.Component {
       <div className={'sort_table_wrapper'}>
         {visible && (
           <Modal
-            title="筛选条件设置"
+            title="展示列设置"
             wrapClassName={'sort_table_wrapper'}
             width={810}
             visible={visible}
@@ -748,7 +748,7 @@ class SortableTable extends React.Component {
             <div className={'sort_table'}>
               <div className={'sort_table_column_wrapper'}>
                 <span className={'sort_table_column_count'}>
-                  <span>勾选你想使用的筛选条件</span>
+                  <span>勾选你想展示的表格列</span>
                 </span>
                 <div className={'sort_table_column'}>
                   <Input
@@ -882,7 +882,7 @@ class SortableTable extends React.Component {
               </div>
               <div className={'sort_table_content_wrapper'}>
                 <span className={'sort_table_content_count'}>
-                  <span>已选择的搜索条件排序</span>
+                  <span>已选择的展示列排序</span>
                 </span>
                 <div className={'sort_table_content'}>
                   <span style={{ paddingLeft: '10px' }}>

package/src/components/Business/BsSulaQueryTable/utils.tsx

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import React, { useState } from 'react';
+import * as ReactDOMServer from 'react-dom/server';
 import {
   Tooltip,
   Badge,
@@ -722,7 +723,7 @@ export const authFn = (code?: any) => {
 export const renderToString = (
   render: ReactElement<any, string | JSXElementConstructor<any>> | string,
 ) => {
-  return render;
+  // return render;
   return typeof render === 'string'
     ? render
     : ReactDOMServer.renderToString(render);

package/src/components/Business/CommodityEntry/index.tsx

@@ -34,16 +34,18 @@ const CommodityEntry = (props: any) => {
 
   const handleOk = () => {
     // 方法获取当前组件内部的数据，然后进行自身的业务操作
-    const resultData = dataValidationRef.current?.getValidateData();
+    let resultData = props?.notValid ? dataValidationRef.current?.getData() : dataValidationRef.current?.getValidateData();
 
-    if (!resultData.successData.length) {
-      message.error("无校验通过数据，请校验数据");
-      return;
-    }
-
-    if (resultData.failData.length) {
-      message.error(`有${resultData.failData.length}条校验失败数据`);
-      return;
+    if(!(!!props?.notValid)) {
+      if (!resultData.successData.length) {
+        message.error("无校验通过数据，请校验数据");
+        return;
+      }
+  
+      if (resultData.failData.length) {
+        message.error(`有${resultData.failData.length}条校验失败数据`);
+        return;
+      }
     }
 
     callbackHandleOk(resultData, () => {

package/src/components/Business/DetailPageWrapper/index.less

@@ -94,7 +94,7 @@
     align-items: center;
     gap: 2px;
     border-radius: 3px;
-    padding: 0 10px;
+    padding: 0 2px;
   }
   .ant-btn-dangerous {
     background-color: #EC5246 !important;

package/src/components/Business/DetailPageWrapper/index.tsx

@@ -12,6 +12,12 @@ import editIcon from '../../../assets/btn-edit.svg';
 import submitIcon from '../../../assets/btn-submit.svg';
 import deleteIcon from '../../../assets/btn-delete.svg';
 import moreIcon from '../../../assets/btn-more.svg';
+import hangUpIcon from '../../../assets/btn-hangUp.svg';
+import unhookIcon from '../../../assets/btn-unhook.svg';
+import refreshIcon from '../../../assets/btn-refresh.svg';
+import printIcon from '../../../assets/btn-print.svg';
+import copyIcon from '../../../assets/btn-copy.svg';
+import cancelIcon from '../../../assets/btn-cancel.svg';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
 import ENUM from '@/utils/enumConfig';
@@ -30,11 +36,21 @@ interface actionItem {
   action: object;
 }
 
+const iconStyle = {
+  width: 16,
+  height: 16,
+};
 export const iconMap = {
-  edit: <img src={editIcon} />,
-  delete: <img src={deleteIcon} />,
-  submit: <img src={submitIcon} />,
-  more: <img src={moreIcon} />,
+  edit: <img src={editIcon} {...iconStyle} />,
+  delete: <img src={deleteIcon} {...iconStyle} />,
+  submit: <img src={submitIcon} {...iconStyle} />,
+  more: <img src={moreIcon} {...iconStyle} />,
+  hangUp: <img src={hangUpIcon} {...iconStyle} />,
+  unhook: <img src={unhookIcon} {...iconStyle} />,
+  refresh: <img src={refreshIcon} {...iconStyle} />,
+  print: <img src={printIcon} {...iconStyle} />,
+  copy: <img src={copyIcon} {...iconStyle} />,
+  cancel: <img src={cancelIcon} {...iconStyle} />,
 };
 
 export default (props: any) => {
@@ -194,6 +210,7 @@ const DetailWrapper = React.memo(
           <Button
             type={type || 'primary'}
             icon={item.icon ? iconMap[item.icon] : ''}
+            style={item.icon ? {} : {}}
             danger={item.name === '删除' ? true : false}
             disabled={item.disabled}
             onClick={() => {
@@ -203,13 +220,15 @@ const DetailWrapper = React.memo(
                 doDetailPageAction(item.action);
               }
             }}
+            {...item?.buttomProps}
           >
             {item.name}
           </Button>
         );
       };
 
-      if (visibleActions.length <= 3) {
+      // 可在actionList第一项设置visibleActionCount，控制按钮几个开始显示更多，默认为3个
+      if (visibleActions.length <= (actionLists?.[0]?.visibleActionCount || 3)) {
         return visibleActions.map((item) => {
           return renderButton(item);
         });

package/src/components/Business/DetailPageWrapper/utils.tsx

@@ -85,7 +85,12 @@ export const getMainCrumbNameMap = (menuData) => {
 
   const flattenMenuData = (data, parent) => {
     let pNameMap = parent.nameMap ? [...parent.nameMap] : [];
-    data.forEach((menuItem) => {
+    data.forEach((menuItem) => { 
+      // 面包屑路径，增加显示一级导航路径显示
+      if(parent.isMenuRoot) {
+        const newList = (window.top||window)?.applicationList?.filter?.((app: any) => app.code === menuItem.belongAppCode) || [];
+        pNameMap = newList.length > 0 ? [newList[0].name] : [];
+      }
       let newMenuItem = {
         ...menuItem,
         nameMap: [...pNameMap, menuItem.name]
@@ -100,7 +105,7 @@ export const getMainCrumbNameMap = (menuData) => {
       };
     });
   };
-  flattenMenuData(menuData, {});
+  flattenMenuData(menuData,{ isMenuRoot: true });
   return routerMap;
 }
 

package/src/components/Business/HomePageWrapper/index.less

@@ -1,5 +1,5 @@
 .bs_home_page_head_wrapper{
-  height: 32px;
+  // 如果设置高度 需要考虑列表页引用有传提示参数alertProps情况，写死固定高度会导致提示遮挡筛选条件
   position: sticky;
   background: #fff;
   width: 100%;

package/src/components/Business/ItemPropertySelector/index.tsx

@@ -0,0 +1,88 @@
+// @ts-nocheck
+
+import React, { useState, useEffect } from 'react';
+import { Input, Select } from 'antd';
+import { request } from 'bssula';
+
+const ItemPropertySelector = ({
+    onChange,
+    value,
+    propertyCode,
+    name,
+    ...restProps
+}: any) => {
+
+    const [source, setSource] = useState([]);
+
+    useEffect(() => {
+        // FIXME: 目前只能通过固定属性编码先获取属性id，再通过属性id去查属性值 @林军
+        if (propertyCode) {
+            request({
+                url: `/items/item/propertyValue/getPropertyValueNoPagerByCode?qp-propertyCode-eq=${propertyCode}&pageSize=5000`,
+                method: 'GET',
+                converter: ({ data }: any) => {
+                    const source = (data?.items || []).map(item => ({
+                        text: item.value,
+                        value: item.value
+                    }))
+                    setSource(source);
+                }
+            })
+            return;
+            request({
+                url: `/items/item/property?qp-propertyCode-eq=${propertyCode}`,
+                metod: 'GET',
+                converter: ({ data }: any) => {
+                    let propInfo = data?.items?.[0] || {};
+                    if (propInfo?.dictIs) {
+                        request({
+                            url: `/items/bscDict/detailAndFilter/${propInfo?.dictCode}`,
+                            method: 'GET',
+                            converter: ({ data }: any) => {
+                                const source = (data?.dictItemResVoList || []).map(item => ({
+                                    text: item.dictItemName,
+                                    value: item.dictItemName
+                                }))
+                                setSource(source);
+                            }
+                        })
+                        return;
+                    }
+
+                    if (propInfo?.id) {
+                        request({
+                            url: `/items/item/propertyValue?qp-propertyId-eq=${propInfo?.id}`,
+                            method: 'GET',
+                            converter: ({ data }: any) => {
+                                const source = (data?.items || []).map(item => ({
+                                    text: item.value,
+                                    value: item.value
+                                }))
+                                setSource(source);
+                            }
+                        })
+                    }
+                }
+            })
+        }
+    }, [propertyCode]);
+
+
+    return (
+        <Select
+            {...restProps}
+            value={value}
+            allowClear
+            style={{width: '100%'}}
+            onChange={(v: any) => {
+                onChange(v);
+            }}
+        >
+            {source.map((res) => {
+                return <Select.Option value={res.value}>{res.text}</Select.Option>;
+            })}
+        </Select>
+    );
+};
+
+export default ItemPropertySelector;