@zat-design/sisyphus-react 3.6.4-beta.10 → 3.6.4-beta.12
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/es/ProForm/components/combination/FormList/index.js +0 -5
- package/es/ProForm/components/combination/ProModalSelect/index.js +2 -1
- package/lib/ProForm/components/combination/FormList/index.js +0 -5
- package/lib/ProForm/components/combination/ProModalSelect/index.js +2 -1
- package/package.json +1 -1
|
@@ -5,7 +5,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
|
5
5
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
6
6
|
import { forwardRef, useCallback, useImperativeHandle } from 'react';
|
|
7
7
|
import { DndContext } from '@dnd-kit/core';
|
|
8
|
-
import { cloneDeep, isFunction } from 'lodash';
|
|
9
8
|
import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
|
|
10
9
|
import { toArray } from '../../../utils';
|
|
11
10
|
import { namesPathTransform } from './utils';
|
|
@@ -56,10 +55,6 @@ var FormList = function FormList(props, ref) {
|
|
|
56
55
|
listName: [].concat(_toConsumableArray(namePath), [item.name]),
|
|
57
56
|
label: mode === 'less' ? undefined : item.label
|
|
58
57
|
});
|
|
59
|
-
// 可编辑表格的columns需要消除引用关系,防止串数据
|
|
60
|
-
if (column.type === 'ProEditTable' && !isFunction(column.fieldProps)) {
|
|
61
|
-
column.fieldProps.columns = cloneDeep(column.fieldProps.columns);
|
|
62
|
-
}
|
|
63
58
|
return column;
|
|
64
59
|
});
|
|
65
60
|
}, [columns]);
|
|
@@ -160,7 +160,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
160
160
|
var defaultOptionRender = function defaultOptionRender(rowData) {
|
|
161
161
|
return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
|
|
162
162
|
};
|
|
163
|
-
var handleFormat =
|
|
163
|
+
var handleFormat = onFormat || defaultOptionRender;
|
|
164
164
|
if (showCodeName) {
|
|
165
165
|
handleFormat = function handleFormat(_ref5) {
|
|
166
166
|
var value = _ref5.value,
|
|
@@ -681,6 +681,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
681
681
|
showCodeName: showCodeName,
|
|
682
682
|
labelInValue: labelInValue,
|
|
683
683
|
dataSource: options,
|
|
684
|
+
optionRender: optionRender,
|
|
684
685
|
scrollFollowParent: false,
|
|
685
686
|
mode: isMultiple ? 'multiple' : undefined,
|
|
686
687
|
onFocus: function onFocus() {
|
|
@@ -11,7 +11,6 @@ var _jsxRuntime = require("react/jsx-runtime");
|
|
|
11
11
|
var _react = require("react");
|
|
12
12
|
var _antd = require("antd");
|
|
13
13
|
var _core = require("@dnd-kit/core");
|
|
14
|
-
var _lodash = require("lodash");
|
|
15
14
|
var _sortable = require("@dnd-kit/sortable");
|
|
16
15
|
var _utils = require("../../../utils");
|
|
17
16
|
var _utils2 = require("./utils");
|
|
@@ -62,10 +61,6 @@ var FormList = function FormList(props, ref) {
|
|
|
62
61
|
listName: [].concat((0, _toConsumableArray2.default)(namePath), [item.name]),
|
|
63
62
|
label: mode === 'less' ? undefined : item.label
|
|
64
63
|
});
|
|
65
|
-
// 可编辑表格的columns需要消除引用关系,防止串数据
|
|
66
|
-
if (column.type === 'ProEditTable' && !(0, _lodash.isFunction)(column.fieldProps)) {
|
|
67
|
-
column.fieldProps.columns = (0, _lodash.cloneDeep)(column.fieldProps.columns);
|
|
68
|
-
}
|
|
69
64
|
return column;
|
|
70
65
|
});
|
|
71
66
|
}, [columns]);
|
|
@@ -157,7 +157,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
157
157
|
var defaultOptionRender = function defaultOptionRender(rowData) {
|
|
158
158
|
return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
|
|
159
159
|
};
|
|
160
|
-
var handleFormat =
|
|
160
|
+
var handleFormat = onFormat || defaultOptionRender;
|
|
161
161
|
if (showCodeName) {
|
|
162
162
|
handleFormat = function handleFormat(_ref5) {
|
|
163
163
|
var value = _ref5.value,
|
|
@@ -678,6 +678,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
678
678
|
showCodeName: showCodeName,
|
|
679
679
|
labelInValue: labelInValue,
|
|
680
680
|
dataSource: options,
|
|
681
|
+
optionRender: optionRender,
|
|
681
682
|
scrollFollowParent: false,
|
|
682
683
|
mode: isMultiple ? 'multiple' : undefined,
|
|
683
684
|
onFocus: function onFocus() {
|