@nocobase/client 0.7.0-alpha.1 → 0.7.0-alpha.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/esm/schema-component/antd/kanban-v2/Kanban.js +3 -3
- package/esm/schema-component/antd/kanban-v2/Kanban.js.map +1 -1
- package/lib/schema-component/antd/kanban-v2/Kanban.js +3 -3
- package/lib/schema-component/antd/kanban-v2/Kanban.js.map +1 -1
- package/package.json +3 -3
- package/src/schema-component/antd/kanban-v2/Kanban.tsx +3 -3
|
@@ -141,7 +141,7 @@ export var Kanban = observer(function (props) {
|
|
|
141
141
|
var _a = useProps(props), groupField = _a.groupField, onCardDragEnd = _a.onCardDragEnd, restProps = __rest(_a, ["groupField", "onCardDragEnd"]);
|
|
142
142
|
var field = useField();
|
|
143
143
|
var fieldSchema = useFieldSchema();
|
|
144
|
-
var _b = __read(useState(
|
|
144
|
+
var _b = __read(useState(false), 2), disableCardDrag = _b[0], setDisableCardDrag = _b[1];
|
|
145
145
|
var schemas = useMemo(function () {
|
|
146
146
|
return fieldSchema.reduceProperties(function (buf, current) {
|
|
147
147
|
if (current['x-component'].endsWith('.Card')) {
|
|
@@ -165,7 +165,7 @@ export var Kanban = observer(function (props) {
|
|
|
165
165
|
var updatedBoard = Board.moveCard({ columns: field.value }, fromColumn, toColumn);
|
|
166
166
|
field.value = updatedBoard.columns;
|
|
167
167
|
};
|
|
168
|
-
return (_jsx(Spin, __assign({ spinning: field.loading || false }, { children: _jsx(Board, __assign({ allowAddCard: !!schemas.cardAdder, disableColumnDrag: true, cardAdderPosition: 'bottom', disableCardDrag: disableCardDrag, onCardRemove: handleCardRemove, onCardDragEnd: handleCardDragEnd, renderColumnHeader: function (_a) {
|
|
168
|
+
return (_jsx(Spin, __assign({ spinning: field.loading || false }, { children: _jsx(Board, __assign({}, restProps, { allowAddCard: !!schemas.cardAdder, disableColumnDrag: true, cardAdderPosition: 'bottom', disableCardDrag: restProps.disableCardDrag || disableCardDrag, onCardRemove: handleCardRemove, onCardDragEnd: handleCardDragEnd, renderColumnHeader: function (_a) {
|
|
169
169
|
var title = _a.title, color = _a.color;
|
|
170
170
|
return (_jsx("div", __assign({ className: 'react-kanban-column-header' }, { children: _jsx(Tag, __assign({ color: color }, { children: title }), void 0) }), void 0));
|
|
171
171
|
}, renderCard: function (card, _a) {
|
|
@@ -189,7 +189,7 @@ export var Kanban = observer(function (props) {
|
|
|
189
189
|
return null;
|
|
190
190
|
}
|
|
191
191
|
return (_jsx(KanbanColumnContext.Provider, __assign({ value: { column: column, groupField: groupField } }, { children: _jsx(SchemaComponentOptions, __assign({ scope: { useCreateActionProps: useCreateActionProps } }, { children: _jsx(RecursionField, { name: schemas.cardAdder.name, schema: schemas.cardAdder }, void 0) }), void 0) }), void 0));
|
|
192
|
-
} },
|
|
192
|
+
} }, { children: {
|
|
193
193
|
columns: field.value || [],
|
|
194
194
|
} }), void 0) }), void 0));
|
|
195
195
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kanban.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/kanban-v2/Kanban.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Kanban.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/kanban-v2/Kanban.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ArrayField } from '@formily/core';\nimport { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react';\nimport { Spin, Tag } from 'antd';\nimport React, { useContext, useMemo, useState } from 'react';\nimport { SchemaComponentOptions } from '../..';\nimport { RecordProvider } from '../../../';\nimport { useCreateActionProps as useCAP } from '../../../block-provider/hooks';\nimport { Board } from '../../../board';\nimport '../../../board/style.less';\nimport { useProps } from '../../hooks/useProps';\nimport { KanbanCardContext, KanbanColumnContext } from './context';\nimport './index.less';\n\nconst useCreateActionProps = () => {\n const form = useForm();\n const { column, groupField } = useContext(KanbanColumnContext);\n const { onClick } = useCAP();\n return {\n async onClick() {\n form.setValuesIn(groupField.name, column.id);\n await onClick();\n },\n };\n};\n\nexport const toColumns = (groupField: any, dataSource: Array<any> = []) => {\n const columns = {\n __unknown__: {\n id: '__unknown__',\n title: 'Unknown',\n color: 'default',\n cards: [],\n },\n };\n groupField.uiSchema.enum.forEach((item) => {\n columns[item.value] = {\n id: item.value,\n title: item.label,\n color: item.color,\n cards: [],\n };\n });\n dataSource.forEach((ds) => {\n const value = ds[groupField.name];\n if (value && columns[value]) {\n columns[value].cards.push(ds);\n } else {\n columns.__unknown__.cards.push(ds);\n }\n });\n if (columns.__unknown__.cards.length === 0) {\n delete columns.__unknown__;\n }\n return Object.values(columns);\n};\n\nexport const Kanban: ComposedKanban = observer((props: any) => {\n const { groupField, onCardDragEnd, ...restProps } = useProps(props);\n const field = useField<ArrayField>();\n const fieldSchema = useFieldSchema();\n const [disableCardDrag, setDisableCardDrag] = useState(false);\n const schemas = useMemo(\n () =>\n fieldSchema.reduceProperties(\n (buf, current) => {\n if (current['x-component'].endsWith('.Card')) {\n buf.card = current;\n } else if (current['x-component'].endsWith('.CardAdder')) {\n buf.cardAdder = current;\n } else if (current['x-component'].endsWith('.CardViewer')) {\n buf.cardViewer = current;\n }\n return buf;\n },\n { card: null, cardAdder: null, cardViewer: null },\n ),\n [],\n );\n const handleCardRemove = (card, column) => {\n const updatedBoard = Board.removeCard({ columns: field.value }, column, card);\n field.value = updatedBoard.columns;\n };\n const handleCardDragEnd = (card, fromColumn, toColumn) => {\n onCardDragEnd?.({ columns: field.value, groupField }, fromColumn, toColumn);\n const updatedBoard = Board.moveCard({ columns: field.value }, fromColumn, toColumn);\n field.value = updatedBoard.columns;\n };\n return (\n <Spin spinning={field.loading || false}>\n <Board\n {...restProps}\n allowAddCard={!!schemas.cardAdder}\n disableColumnDrag\n cardAdderPosition={'bottom'}\n disableCardDrag={restProps.disableCardDrag || disableCardDrag}\n onCardRemove={handleCardRemove}\n onCardDragEnd={handleCardDragEnd}\n renderColumnHeader={({ title, color }) => (\n <div className={'react-kanban-column-header'}>\n <Tag color={color}>{title}</Tag>\n </div>\n )}\n renderCard={(card, { column, dragging }) => {\n const columnIndex = field.value?.indexOf(column);\n const cardIndex = column?.cards?.indexOf(card);\n return (\n schemas.card && (\n <RecordProvider record={card}>\n <KanbanCardContext.Provider\n value={{\n setDisableCardDrag,\n cardViewerSchema: schemas.cardViewer,\n cardField: field,\n card,\n column,\n dragging,\n columnIndex,\n cardIndex,\n }}\n >\n <RecursionField name={schemas.card.name} schema={schemas.card} />\n </KanbanCardContext.Provider>\n </RecordProvider>\n )\n );\n }}\n renderCardAdder={({ column }) => {\n if (!schemas.cardAdder) {\n return null;\n }\n return (\n <KanbanColumnContext.Provider value={{ column, groupField }}>\n <SchemaComponentOptions scope={{ useCreateActionProps }}>\n <RecursionField name={schemas.cardAdder.name} schema={schemas.cardAdder} />\n </SchemaComponentOptions>\n </KanbanColumnContext.Provider>\n );\n }}\n >\n {{\n columns: field.value || [],\n }}\n </Board>\n </Spin>\n );\n});\n"]}
|
|
@@ -145,7 +145,7 @@ exports.Kanban = (0, react_1.observer)(function (props) {
|
|
|
145
145
|
var _a = (0, useProps_1.useProps)(props), groupField = _a.groupField, onCardDragEnd = _a.onCardDragEnd, restProps = __rest(_a, ["groupField", "onCardDragEnd"]);
|
|
146
146
|
var field = (0, react_1.useField)();
|
|
147
147
|
var fieldSchema = (0, react_1.useFieldSchema)();
|
|
148
|
-
var _b = __read((0, react_2.useState)(
|
|
148
|
+
var _b = __read((0, react_2.useState)(false), 2), disableCardDrag = _b[0], setDisableCardDrag = _b[1];
|
|
149
149
|
var schemas = (0, react_2.useMemo)(function () {
|
|
150
150
|
return fieldSchema.reduceProperties(function (buf, current) {
|
|
151
151
|
if (current['x-component'].endsWith('.Card')) {
|
|
@@ -169,7 +169,7 @@ exports.Kanban = (0, react_1.observer)(function (props) {
|
|
|
169
169
|
var updatedBoard = board_1.Board.moveCard({ columns: field.value }, fromColumn, toColumn);
|
|
170
170
|
field.value = updatedBoard.columns;
|
|
171
171
|
};
|
|
172
|
-
return ((0, jsx_runtime_1.jsx)(antd_1.Spin, __assign({ spinning: field.loading || false }, { children: (0, jsx_runtime_1.jsx)(board_1.Board, __assign({ allowAddCard: !!schemas.cardAdder, disableColumnDrag: true, cardAdderPosition: 'bottom', disableCardDrag: disableCardDrag, onCardRemove: handleCardRemove, onCardDragEnd: handleCardDragEnd, renderColumnHeader: function (_a) {
|
|
172
|
+
return ((0, jsx_runtime_1.jsx)(antd_1.Spin, __assign({ spinning: field.loading || false }, { children: (0, jsx_runtime_1.jsx)(board_1.Board, __assign({}, restProps, { allowAddCard: !!schemas.cardAdder, disableColumnDrag: true, cardAdderPosition: 'bottom', disableCardDrag: restProps.disableCardDrag || disableCardDrag, onCardRemove: handleCardRemove, onCardDragEnd: handleCardDragEnd, renderColumnHeader: function (_a) {
|
|
173
173
|
var title = _a.title, color = _a.color;
|
|
174
174
|
return ((0, jsx_runtime_1.jsx)("div", __assign({ className: 'react-kanban-column-header' }, { children: (0, jsx_runtime_1.jsx)(antd_1.Tag, __assign({ color: color }, { children: title }), void 0) }), void 0));
|
|
175
175
|
}, renderCard: function (card, _a) {
|
|
@@ -193,7 +193,7 @@ exports.Kanban = (0, react_1.observer)(function (props) {
|
|
|
193
193
|
return null;
|
|
194
194
|
}
|
|
195
195
|
return ((0, jsx_runtime_1.jsx)(context_1.KanbanColumnContext.Provider, __assign({ value: { column: column, groupField: groupField } }, { children: (0, jsx_runtime_1.jsx)(__1.SchemaComponentOptions, __assign({ scope: { useCreateActionProps: useCreateActionProps } }, { children: (0, jsx_runtime_1.jsx)(react_1.RecursionField, { name: schemas.cardAdder.name, schema: schemas.cardAdder }, void 0) }), void 0) }), void 0));
|
|
196
|
-
} },
|
|
196
|
+
} }, { children: {
|
|
197
197
|
columns: field.value || [],
|
|
198
198
|
} }), void 0) }), void 0));
|
|
199
199
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kanban.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/kanban-v2/Kanban.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wCAA6F;AAC7F,6BAAiC;AACjC,+BAA6D;AAC7D,2BAA+C;AAC/C,+BAA2C;AAC3C,uDAA+E;AAC/E,wCAAuC;AACvC,qCAAmC;AACnC,iDAAgD;AAChD,qCAAmE;AACnE,wBAAsB;AAEtB,IAAM,oBAAoB,GAAG;IAC3B,IAAM,IAAI,GAAG,IAAA,eAAO,GAAE,CAAC;IACjB,IAAA,KAAyB,IAAA,kBAAU,EAAC,6BAAmB,CAAC,EAAtD,MAAM,YAAA,EAAE,UAAU,gBAAoC,CAAC;IACvD,IAAA,OAAO,GAAK,IAAA,4BAAM,GAAE,QAAb,CAAc;IAC7B,OAAO;QACC,OAAO;;;;;4BACX,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;4BAC7C,qBAAM,OAAO,EAAE,EAAA;;4BAAf,SAAe,CAAC;;;;;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,SAAS,GAAG,UAAC,UAAe,EAAE,UAA2B;IAA3B,2BAAA,EAAA,eAA2B;IACpE,IAAM,OAAO,GAAG;QACd,WAAW,EAAE;YACX,EAAE,EAAE,aAAa;YACjB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,EAAE;SACV;KACF,CAAC;IACF,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAC,IAAI;QACpC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG;YACpB,EAAE,EAAE,IAAI,CAAC,KAAK;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,EAAE;SACV,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,OAAO,CAAC,UAAC,EAAE;QACpB,IAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;YAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC/B;aAAM;YACL,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACpC;IACH,CAAC,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1C,OAAO,OAAO,CAAC,WAAW,CAAC;KAC5B;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC,CAAC;AA7BW,QAAA,SAAS,aA6BpB;AAEW,QAAA,MAAM,GAAmB,IAAA,gBAAQ,EAAC,UAAC,KAAU;IACxD,IAAM,KAA8C,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAA3D,UAAU,gBAAA,EAAE,aAAa,mBAAA,EAAK,SAAS,cAAzC,+BAA2C,CAAkB,CAAC;IACpE,IAAM,KAAK,GAAG,IAAA,gBAAQ,GAAc,CAAC;IACrC,IAAM,WAAW,GAAG,IAAA,sBAAc,GAAE,CAAC;IAC/B,IAAA,KAAA,OAAwC,IAAA,gBAAQ,EAAC,
|
|
1
|
+
{"version":3,"file":"Kanban.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/kanban-v2/Kanban.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ArrayField } from '@formily/core';\nimport { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react';\nimport { Spin, Tag } from 'antd';\nimport React, { useContext, useMemo, useState } from 'react';\nimport { SchemaComponentOptions } from '../..';\nimport { RecordProvider } from '../../../';\nimport { useCreateActionProps as useCAP } from '../../../block-provider/hooks';\nimport { Board } from '../../../board';\nimport '../../../board/style.less';\nimport { useProps } from '../../hooks/useProps';\nimport { KanbanCardContext, KanbanColumnContext } from './context';\nimport './index.less';\n\nconst useCreateActionProps = () => {\n const form = useForm();\n const { column, groupField } = useContext(KanbanColumnContext);\n const { onClick } = useCAP();\n return {\n async onClick() {\n form.setValuesIn(groupField.name, column.id);\n await onClick();\n },\n };\n};\n\nexport const toColumns = (groupField: any, dataSource: Array<any> = []) => {\n const columns = {\n __unknown__: {\n id: '__unknown__',\n title: 'Unknown',\n color: 'default',\n cards: [],\n },\n };\n groupField.uiSchema.enum.forEach((item) => {\n columns[item.value] = {\n id: item.value,\n title: item.label,\n color: item.color,\n cards: [],\n };\n });\n dataSource.forEach((ds) => {\n const value = ds[groupField.name];\n if (value && columns[value]) {\n columns[value].cards.push(ds);\n } else {\n columns.__unknown__.cards.push(ds);\n }\n });\n if (columns.__unknown__.cards.length === 0) {\n delete columns.__unknown__;\n }\n return Object.values(columns);\n};\n\nexport const Kanban: ComposedKanban = observer((props: any) => {\n const { groupField, onCardDragEnd, ...restProps } = useProps(props);\n const field = useField<ArrayField>();\n const fieldSchema = useFieldSchema();\n const [disableCardDrag, setDisableCardDrag] = useState(false);\n const schemas = useMemo(\n () =>\n fieldSchema.reduceProperties(\n (buf, current) => {\n if (current['x-component'].endsWith('.Card')) {\n buf.card = current;\n } else if (current['x-component'].endsWith('.CardAdder')) {\n buf.cardAdder = current;\n } else if (current['x-component'].endsWith('.CardViewer')) {\n buf.cardViewer = current;\n }\n return buf;\n },\n { card: null, cardAdder: null, cardViewer: null },\n ),\n [],\n );\n const handleCardRemove = (card, column) => {\n const updatedBoard = Board.removeCard({ columns: field.value }, column, card);\n field.value = updatedBoard.columns;\n };\n const handleCardDragEnd = (card, fromColumn, toColumn) => {\n onCardDragEnd?.({ columns: field.value, groupField }, fromColumn, toColumn);\n const updatedBoard = Board.moveCard({ columns: field.value }, fromColumn, toColumn);\n field.value = updatedBoard.columns;\n };\n return (\n <Spin spinning={field.loading || false}>\n <Board\n {...restProps}\n allowAddCard={!!schemas.cardAdder}\n disableColumnDrag\n cardAdderPosition={'bottom'}\n disableCardDrag={restProps.disableCardDrag || disableCardDrag}\n onCardRemove={handleCardRemove}\n onCardDragEnd={handleCardDragEnd}\n renderColumnHeader={({ title, color }) => (\n <div className={'react-kanban-column-header'}>\n <Tag color={color}>{title}</Tag>\n </div>\n )}\n renderCard={(card, { column, dragging }) => {\n const columnIndex = field.value?.indexOf(column);\n const cardIndex = column?.cards?.indexOf(card);\n return (\n schemas.card && (\n <RecordProvider record={card}>\n <KanbanCardContext.Provider\n value={{\n setDisableCardDrag,\n cardViewerSchema: schemas.cardViewer,\n cardField: field,\n card,\n column,\n dragging,\n columnIndex,\n cardIndex,\n }}\n >\n <RecursionField name={schemas.card.name} schema={schemas.card} />\n </KanbanCardContext.Provider>\n </RecordProvider>\n )\n );\n }}\n renderCardAdder={({ column }) => {\n if (!schemas.cardAdder) {\n return null;\n }\n return (\n <KanbanColumnContext.Provider value={{ column, groupField }}>\n <SchemaComponentOptions scope={{ useCreateActionProps }}>\n <RecursionField name={schemas.cardAdder.name} schema={schemas.cardAdder} />\n </SchemaComponentOptions>\n </KanbanColumnContext.Provider>\n );\n }}\n >\n {{\n columns: field.value || [],\n }}\n </Board>\n </Spin>\n );\n});\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/client",
|
|
3
|
-
"version": "0.7.0-alpha.
|
|
3
|
+
"version": "0.7.0-alpha.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"licenses": [
|
|
6
6
|
{
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@formily/antd": "^2.0.15",
|
|
30
30
|
"@formily/core": "^2.0.15",
|
|
31
31
|
"@formily/react": "^2.0.15",
|
|
32
|
-
"@nocobase/utils": "0.7.0-alpha.
|
|
32
|
+
"@nocobase/utils": "0.7.0-alpha.2",
|
|
33
33
|
"ahooks": "^3.0.5",
|
|
34
34
|
"antd": "^4.18.9",
|
|
35
35
|
"axios": "^0.24.0",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"@types/marked": "^4.0.1",
|
|
67
67
|
"axios-mock-adapter": "^1.20.0"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "0e0e99ef79c0b25bb0b45ecaa477c049cb16afee"
|
|
70
70
|
}
|
|
@@ -58,7 +58,7 @@ export const Kanban: ComposedKanban = observer((props: any) => {
|
|
|
58
58
|
const { groupField, onCardDragEnd, ...restProps } = useProps(props);
|
|
59
59
|
const field = useField<ArrayField>();
|
|
60
60
|
const fieldSchema = useFieldSchema();
|
|
61
|
-
const [disableCardDrag, setDisableCardDrag] = useState(
|
|
61
|
+
const [disableCardDrag, setDisableCardDrag] = useState(false);
|
|
62
62
|
const schemas = useMemo(
|
|
63
63
|
() =>
|
|
64
64
|
fieldSchema.reduceProperties(
|
|
@@ -88,10 +88,11 @@ export const Kanban: ComposedKanban = observer((props: any) => {
|
|
|
88
88
|
return (
|
|
89
89
|
<Spin spinning={field.loading || false}>
|
|
90
90
|
<Board
|
|
91
|
+
{...restProps}
|
|
91
92
|
allowAddCard={!!schemas.cardAdder}
|
|
92
93
|
disableColumnDrag
|
|
93
94
|
cardAdderPosition={'bottom'}
|
|
94
|
-
disableCardDrag={disableCardDrag}
|
|
95
|
+
disableCardDrag={restProps.disableCardDrag || disableCardDrag}
|
|
95
96
|
onCardRemove={handleCardRemove}
|
|
96
97
|
onCardDragEnd={handleCardDragEnd}
|
|
97
98
|
renderColumnHeader={({ title, color }) => (
|
|
@@ -135,7 +136,6 @@ export const Kanban: ComposedKanban = observer((props: any) => {
|
|
|
135
136
|
</KanbanColumnContext.Provider>
|
|
136
137
|
);
|
|
137
138
|
}}
|
|
138
|
-
{...restProps}
|
|
139
139
|
>
|
|
140
140
|
{{
|
|
141
141
|
columns: field.value || [],
|