ztxkui 4.2.23-600 → 4.2.23-602

package/dist/components/Table/hooks/useColumns.js

@@ -359,6 +359,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         _columns.forEach(function (column) {
             var dataIndex = column.dataIndex || column.key;
             if (typeof dataIndex === 'string' &&
+                !column.disablePrecisionControl &&
                 (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, column))) {
                 autoDecimalFieldsRef.current[dataIndex] = {
                     autoDecimal: true,
@@ -379,7 +380,10 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         // 当前字段是否需要控制小数位(前提是必须要有物料描述字段并且传入了部门参数)
         var isDecimal = false;
         var dataIndex = col.dataIndex || col.key;
-        if (materialDescField && isDecimalField && typeof dataIndex === 'string') {
+        if (materialDescField &&
+            isDecimalField &&
+            typeof dataIndex === 'string' &&
+            !col.disablePrecisionControl) {
             isDecimal = isDecimalField(dataIndex, col);
         }
         // 自定义设置小数位数
@@ -777,7 +781,8 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                         // 如果命中了自定义显示字段，并且命中了是数字
                         var dataIndex = _column.dataIndex || _column.key;
                         var title = columnTitle !== null && columnTitle !== void 0 ? columnTitle : _column.title;
-                        if (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title }))) {
+                        if (!_column.disablePrecisionControl &&
+                            (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title })))) {
                             // 去掉千分符 还是数字的话
                             var newValue = typeof selfResult === 'string'
                                 ? selfResult.replace(/,/g, '')
@@ -883,7 +888,8 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                     // 如果命中了自定义显示字段，并且命中了是数字
                     var dataIndex = _column.dataIndex || _column.key;
                     var title = columnTitle !== null && columnTitle !== void 0 ? columnTitle : _column.title;
-                    if (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title }))) {
+                    if (!_column.disablePrecisionControl &&
+                        (isCustomDecimalField === null || isCustomDecimalField === void 0 ? void 0 : isCustomDecimalField(dataIndex, __assign(__assign({}, _column), { title: title })))) {
                         // 去掉千分符 还是数字的话
                         var newValue_1 = typeof value === 'string' ? (_a = value === null || value === void 0 ? void 0 : value.replace) === null || _a === void 0 ? void 0 : _a.call(value, /,/g, '') : value;
                         if (isNumber(newValue_1) && isNumber(text)) {

package/dist/components/Table/index.d.ts

@@ -55,6 +55,8 @@ export interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, 'r
     dateFormat?: string;
     /**精度 */
     precision?: number;
+    /**是否禁用精度控制（包括isDecimalField、precisionHandle、isCustomDecimalField等动态精度处理）*/
+    disablePrecisionControl?: boolean;
     /**是否加上千分符 */
     thousand?: boolean;
     /**表头别名 */

package/dist/components/Table/table-adddel-column.js

@@ -15,8 +15,8 @@ var TableAddDelColumn = function (_a) {
         ? hideDelIcon(record, index)
         : hideDelIcon;
     return (React.createElement(React.Fragment, null,
-        hiddenAddIcon ? null : (React.createElement("div", { title: i18next.t('新增一行'), className: "zt-column__add-icon" },
-            React.createElement(PlusOutlined, { onClick: debounce(onAddfn, 500) }))),
+        hiddenAddIcon ? null : (React.createElement("div", { title: i18next.t('新增一行'), className: "zt-column__add-icon", onClick: debounce(onAddfn, 500) },
+            React.createElement(PlusOutlined, null))),
         hiddenDelIcon ? null : (React.createElement(Popconfirm, { title: typeof delIconText === 'function'
                 ? delIconText(record, index)
                 : delIconText, onConfirm: function () {

package/dist/components/business/Common/UserForgetPassword/index.js

@@ -281,8 +281,20 @@ var ForgetPassword = function (_a) {
                                     },
                                 ] },
                                 React.createElement(Input.Password, { autoComplete: "off", placeholder: i18next.t('请输入新密码') })),
-                            React.createElement("div", null,
-                                React.createElement("p", { style: { height: 32, lineHeight: '32px', color: 'red' } }, commonMessage.passwordMessage))),
+                            React.createElement("div", { style: { width: '55%', position: 'relative' } },
+                                React.createElement("p", { style: {
+                                        color: '#ff6666',
+                                        width: '300px',
+                                        lineHeight: '16px',
+                                        position: 'absolute',
+                                        border: '1px solid #ff8888',
+                                        borderRadius: '4px',
+                                        padding: '5px',
+                                        zIndex: 100,
+                                        display: 'block',
+                                        background: 'rgba(255, 136, 136, .2)',
+                                        fontVariant: 'jis04',
+                                    } }, commonMessage.passwordMessage))),
                         React.createElement(Item, { name: "newPassword1", label: i18next.t('确认新密码'), rules: [
                                 { required: true, message: i18next.t('请确认密码') },
                                 function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-600",
+  "version": "4.2.23-602",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -111,4 +111,4 @@
     "react-dom": ">=16.9.0",
     "ztxkutils": ">=2.1.1"
   }
-}
+}