@zat-design/sisyphus-react 3.6.3 → 3.6.4-beta.1
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 +1 -1
- package/dist/less.esm.css +1 -1
- package/es/ProEditTable/utils/index.js +1 -1
- package/es/ProForm/components/combination/ProCascader/style/index.less +1 -1
- package/es/ProForm/utils/useShouldUpdate.js +2 -2
- package/es/ProTable/index.js +3 -3
- package/lib/ProEditTable/utils/index.js +1 -1
- package/lib/ProForm/components/combination/ProCascader/style/index.less +1 -1
- package/lib/ProForm/utils/useShouldUpdate.js +1 -1
- package/lib/ProTable/index.js +2 -2
- package/package.json +1 -1
package/dist/index.esm.css
CHANGED
|
@@ -2316,7 +2316,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
|
|
|
2316
2316
|
width: 100%;
|
|
2317
2317
|
}
|
|
2318
2318
|
.pro-address .ant-cascader {
|
|
2319
|
-
width: 45
|
|
2319
|
+
width: 45%;
|
|
2320
2320
|
}
|
|
2321
2321
|
.pro-address .ant-cascader.no-detail {
|
|
2322
2322
|
width: 100% !important;
|
package/dist/less.esm.css
CHANGED
|
@@ -2316,7 +2316,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
|
|
|
2316
2316
|
width: 100%;
|
|
2317
2317
|
}
|
|
2318
2318
|
.pro-address .ant-cascader {
|
|
2319
|
-
width: 45
|
|
2319
|
+
width: 45%;
|
|
2320
2320
|
}
|
|
2321
2321
|
.pro-address .ant-cascader.no-detail {
|
|
2322
2322
|
width: 100% !important;
|
|
@@ -195,7 +195,7 @@ export var transformColumns = function transformColumns() {
|
|
|
195
195
|
setState = config.setState,
|
|
196
196
|
page = config.page;
|
|
197
197
|
var isCell = mode === 'cell';
|
|
198
|
-
var _columns =
|
|
198
|
+
var _columns = _toConsumableArray(columns);
|
|
199
199
|
var _cacheMap = _objectSpread({}, cacheMap.current);
|
|
200
200
|
var pageNum = tools.calc(page.pageNum, '-', 1);
|
|
201
201
|
var firstIndex = tools.calc(pageNum, '*', page.pageSize);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
2
|
import { useRef, useState } from 'react';
|
|
3
|
-
import { isFunction, isEqualWith
|
|
3
|
+
import { isFunction, isEqualWith } from 'lodash';
|
|
4
4
|
import { customEqualForFun, equalDependencies } from './index';
|
|
5
5
|
// 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
|
|
6
6
|
var useShouldUpdate = function useShouldUpdate(props) {
|
|
@@ -174,7 +174,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
|
|
|
174
174
|
}
|
|
175
175
|
if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) ||
|
|
176
176
|
// 值变更,需要同步更新函数式的fieldProps
|
|
177
|
-
isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues) ||
|
|
177
|
+
// (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
|
|
178
178
|
// !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
|
|
179
179
|
equalDependencies(dependencies, prevValues, _currentValues)) {
|
|
180
180
|
showRef.current = _show;
|
package/es/ProTable/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stri
|
|
|
14
14
|
_excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
|
|
15
15
|
import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
16
16
|
import { useEffect, useMemo, useState, createContext } from 'react';
|
|
17
|
-
import {
|
|
17
|
+
import { get, keyBy, assign } from 'lodash';
|
|
18
18
|
import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
|
|
19
19
|
import { ReactSVG } from 'react-svg';
|
|
20
20
|
import classnames from 'classnames';
|
|
@@ -135,9 +135,9 @@ function ProTable(props) {
|
|
|
135
135
|
});
|
|
136
136
|
});
|
|
137
137
|
localColumns = ((_localColumns = localColumns) === null || _localColumns === void 0 ? void 0 : _localColumns.length) === 0 ? undefined : localColumns;
|
|
138
|
-
setCurColumns(
|
|
138
|
+
setCurColumns(localColumns || propsColumns);
|
|
139
139
|
} else {
|
|
140
|
-
setCurColumns(
|
|
140
|
+
setCurColumns(propsColumns);
|
|
141
141
|
}
|
|
142
142
|
}, [pathKey, cacheTime, propsColumns]);
|
|
143
143
|
useEffect(function () {
|
|
@@ -199,7 +199,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
|
|
|
199
199
|
setState = config.setState,
|
|
200
200
|
page = config.page;
|
|
201
201
|
var isCell = mode === 'cell';
|
|
202
|
-
var _columns = (0,
|
|
202
|
+
var _columns = (0, _toConsumableArray2.default)(columns);
|
|
203
203
|
var _cacheMap = (0, _objectSpread2.default)({}, cacheMap.current);
|
|
204
204
|
var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
|
|
205
205
|
var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
|
|
@@ -181,7 +181,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
|
|
|
181
181
|
}
|
|
182
182
|
if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) ||
|
|
183
183
|
// 值变更,需要同步更新函数式的fieldProps
|
|
184
|
-
(
|
|
184
|
+
// (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
|
|
185
185
|
// !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
|
|
186
186
|
(0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
|
|
187
187
|
showRef.current = _show;
|
package/lib/ProTable/index.js
CHANGED
|
@@ -139,9 +139,9 @@ function ProTable(props) {
|
|
|
139
139
|
});
|
|
140
140
|
});
|
|
141
141
|
localColumns = ((_localColumns = localColumns) === null || _localColumns === void 0 ? void 0 : _localColumns.length) === 0 ? undefined : localColumns;
|
|
142
|
-
setCurColumns(
|
|
142
|
+
setCurColumns(localColumns || propsColumns);
|
|
143
143
|
} else {
|
|
144
|
-
setCurColumns(
|
|
144
|
+
setCurColumns(propsColumns);
|
|
145
145
|
}
|
|
146
146
|
}, [pathKey, cacheTime, propsColumns]);
|
|
147
147
|
(0, _react.useEffect)(function () {
|