@cuvp1225/antd 0.1.16 → 0.1.17

package/lib/cjs/components/collapse.d.ts

@@ -1,4 +1,3 @@
 import { CollapseProps } from 'antd';
 import React from 'react';
 export declare const Collapse: React.ForwardRefExoticComponent<CollapseProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;
-export declare const CollapsePanel: React.ForwardRefExoticComponent<import("antd").CollapsePanelProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;

package/lib/cjs/components/collapse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollapsePanel = exports.Collapse = void 0;
+exports.Collapse = void 0;
 const tslib_1 = require("tslib");
 const tango_boot_1 = require("@music163/tango-boot");
 const antd_1 = require("antd");
@@ -30,6 +30,6 @@ exports.Collapse = (0, tango_boot_1.defineComponent)(antd_1.Collapse, {
         },
     },
 });
-exports.CollapsePanel = (0, tango_boot_1.defineComponent)(antd_1.Collapse.Panel, {
-    name: 'CollapsePanel',
-});
+// export const CollapsePanel = defineComponent(AntCollapse.Panel, {
+//     name: 'CollapsePanel',
+// });

package/lib/cjs/components/descriptions.d.ts

@@ -1,6 +1,10 @@
 import { DescriptionsProps } from 'antd';
 import React from 'react';
-export declare const Descriptions: ({ items, [SLOT.dnd]: dataDnd, [SLOT.id]: dataId, ...rest }: DescriptionsProps & {
+export declare const Descriptions: ({ items, [SLOT.id]: dataId, [SLOT.dnd]: dataDnd, ...rest }: DescriptionsProps & {
+    [key: string]: any;
+    children?: React.ReactNode;
+}) => React.JSX.Element;
+export declare const DescriptionsItem: ({ ...rest }: DescriptionsProps & {
     [key: string]: any;
     children?: React.ReactNode;
 }) => React.JSX.Element;

package/lib/cjs/components/descriptions.js

@@ -4,7 +4,7 @@
 // import React, { useEffect} from 'react';
 // import { SLOT } from '@music163/tango-helpers';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Descriptions = void 0;
+exports.DescriptionsItem = exports.Descriptions = void 0;
 const tslib_1 = require("tslib");
 // function DescriptionsDesigner({
 //     items,
@@ -49,27 +49,18 @@ const tslib_1 = require("tslib");
 //         },
 //     },
 // });
-// import { Descriptions as AntDescriptions} from 'antd';
-// import React, {} from 'react';
-// import { SLOT } from '@music163/tango-helpers';
-// export const Descriptions = ({
-//     [SLOT.id]: dataId,
-//     [SLOT.dnd]: dataDnd,
-//     ...rest
-// }) => {
-//     console.log("新的descriptions组件01", dataId, dataDnd, rest);
-//     return (
-//         <div data-dnd={dataDnd} data-id={dataId} draggable={true}>
-//             <AntDescriptions {...rest} > </AntDescriptions>
-//         </div>
-//     )
-// }
 const antd_1 = require("antd");
 const react_1 = tslib_1.__importDefault(require("react"));
 const tango_helpers_1 = require("@music163/tango-helpers");
 const Descriptions = (_a) => {
-    var { items } = _a, _b = tango_helpers_1.SLOT.dnd, dataDnd = _a[_b], _c = tango_helpers_1.SLOT.id, dataId = _a[_c], rest = tslib_1.__rest(_a, ["items", typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
+    var { items } = _a, _b = tango_helpers_1.SLOT.id, dataId = _a[_b], _c = tango_helpers_1.SLOT.dnd, dataDnd = _a[_c], rest = tslib_1.__rest(_a, ["items", typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
+    console.log("新的descriptions组件01", dataId, dataDnd, rest);
     return (react_1.default.createElement("div", { "data-dnd": dataDnd, "data-id": dataId, draggable: true },
-        react_1.default.createElement(antd_1.Descriptions, Object.assign({}, rest), items.map((item) => (react_1.default.createElement(antd_1.Descriptions.Item, { label: item.label, key: item.label }, item.value))))));
+        react_1.default.createElement(antd_1.Descriptions, Object.assign({}, rest), items)));
 };
 exports.Descriptions = Descriptions;
+const DescriptionsItem = (_a) => {
+    var rest = tslib_1.__rest(_a, []);
+    return react_1.default.createElement(antd_1.Descriptions.Item, Object.assign({}, rest), " ");
+};
+exports.DescriptionsItem = DescriptionsItem;

package/lib/cjs/components/index.d.ts

@@ -5,18 +5,17 @@ export { Button, ButtonGroup } from './button';
 export * from './formily';
 export { InputNumber } from './input-number';
 export { Input, TextArea, Password } from './input';
-export { Modalnew } from './modal';
 export * from './page';
 export * from './placeholder';
 export * from './section';
 export { Select } from './select';
 export { Space } from './space';
-export { Result } from './result1';
 export { Drawer } from "./drawer";
 export { DatePicker } from "./date-picker";
 export { Radio, RadioGroup } from "./radio";
 export { Checkbox, CheckboxGroup } from "./checkbox";
 export { Cascader } from "./cascader";
+export { Collapse } from './collapse';
 export { Dropdown, DropdownButton } from './dropdown';
 export { Upload } from "./upload";
 export { Skeleton } from "./skeleton";
@@ -41,7 +40,6 @@ export { AutoComplete } from './auto-complete';
 export { Mentions } from './mentions';
 export { TreeSelect } from './tree-select';
 export { Image } from './image';
-export { Descriptions } from './descriptions';
 export { Tree } from './tree';
 export { Alert } from "./alert";
 export { Progress } from './progress';

package/lib/cjs/components/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Progress = exports.Alert = exports.Tree = exports.Descriptions = exports.Image = exports.TreeSelect = exports.Mentions = exports.AutoComplete = exports.Switch = exports.PageHeader = exports.Statistic = exports.Transfer = exports.TimePicker = exports.Comment = exports.Rate = exports.Slider = exports.Empty = exports.Avatar = exports.Card = exports.Table = exports.Pagination = exports.Badge = exports.Divider = exports.Calendar = exports.Spin = exports.Skeleton = exports.Upload = exports.DropdownButton = exports.Dropdown = exports.Cascader = exports.CheckboxGroup = exports.Checkbox = exports.RadioGroup = exports.Radio = exports.DatePicker = exports.Drawer = exports.Result = exports.Space = exports.Select = exports.Modalnew = exports.Password = exports.TextArea = exports.Input = exports.InputNumber = exports.ButtonGroup = exports.Button = exports.Box = exports.When = exports.Each = void 0;
+exports.Progress = exports.Alert = exports.Tree = exports.Image = exports.TreeSelect = exports.Mentions = exports.AutoComplete = exports.Switch = exports.PageHeader = exports.Statistic = exports.Transfer = exports.TimePicker = exports.Comment = exports.Rate = exports.Slider = exports.Empty = exports.Avatar = exports.Card = exports.Table = exports.Pagination = exports.Badge = exports.Divider = exports.Calendar = exports.Spin = exports.Skeleton = exports.Upload = exports.DropdownButton = exports.Dropdown = exports.Collapse = exports.Cascader = exports.CheckboxGroup = exports.Checkbox = exports.RadioGroup = exports.Radio = exports.DatePicker = exports.Drawer = exports.Space = exports.Select = exports.Password = exports.TextArea = exports.Input = exports.InputNumber = exports.ButtonGroup = exports.Button = exports.Box = exports.When = exports.Each = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("antd"), exports);
 //以下组件都从antd中导出，解决下述组件卡顿问题
@@ -22,8 +22,7 @@ var input_1 = require("./input");
 Object.defineProperty(exports, "Input", { enumerable: true, get: function () { return input_1.Input; } });
 Object.defineProperty(exports, "TextArea", { enumerable: true, get: function () { return input_1.TextArea; } });
 Object.defineProperty(exports, "Password", { enumerable: true, get: function () { return input_1.Password; } });
-var modal_1 = require("./modal");
-Object.defineProperty(exports, "Modalnew", { enumerable: true, get: function () { return modal_1.Modalnew; } });
+//export { Modalnew } from './modal';
 tslib_1.__exportStar(require("./page"), exports);
 tslib_1.__exportStar(require("./placeholder"), exports);
 tslib_1.__exportStar(require("./section"), exports);
@@ -37,8 +36,9 @@ Object.defineProperty(exports, "Space", { enumerable: true, get: function () { r
 //export {Popover} from './popover';
 //export {Tooltip} from './tooltip';
 //export {Result} from './result';
-var result1_1 = require("./result1");
-Object.defineProperty(exports, "Result", { enumerable: true, get: function () { return result1_1.Result; } });
+//export {Result} from './result1';
+//export {Result} from './result2';
+//export {Result} from './result3';
 var drawer_1 = require("./drawer");
 Object.defineProperty(exports, "Drawer", { enumerable: true, get: function () { return drawer_1.Drawer; } });
 var date_picker_1 = require("./date-picker");
@@ -61,7 +61,8 @@ Object.defineProperty(exports, "Cascader", { enumerable: true, get: function ()
 // export { Timeline,TimelineItem } from './timeline1'
 // export { BasicTimeline } from './timeline2'
 //export { Each } from './each'
-//export { Collapse, CollapsePanel } from './collapse'
+var collapse_1 = require("./collapse");
+Object.defineProperty(exports, "Collapse", { enumerable: true, get: function () { return collapse_1.Collapse; } });
 //export { List, ListItem } from './list'
 var dropdown_1 = require("./dropdown");
 Object.defineProperty(exports, "Dropdown", { enumerable: true, get: function () { return dropdown_1.Dropdown; } });
@@ -117,8 +118,7 @@ Object.defineProperty(exports, "TreeSelect", { enumerable: true, get: function (
 var image_1 = require("./image");
 Object.defineProperty(exports, "Image", { enumerable: true, get: function () { return image_1.Image; } });
 //export { Tabs } from './tabs'
-var descriptions_1 = require("./descriptions");
-Object.defineProperty(exports, "Descriptions", { enumerable: true, get: function () { return descriptions_1.Descriptions; } });
+// export { Descriptions } from './descriptions'
 var tree_1 = require("./tree");
 Object.defineProperty(exports, "Tree", { enumerable: true, get: function () { return tree_1.Tree; } });
 var alert_1 = require("./alert");

package/lib/cjs/components/modal.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ModalProps } from 'antd';
-export declare const Modalnew: React.ForwardRefExoticComponent<ModalProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;
+export declare const Modal: React.ForwardRefExoticComponent<ModalProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;

package/lib/cjs/components/modal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Modalnew = void 0;
+exports.Modal = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const styled_components_1 = require("styled-components");
@@ -65,8 +65,8 @@ function ModalDesigner(_a) {
             react_1.default.createElement("div", { className: "ModalPanelBody" }, children || react_1.default.createElement(placeholder_1.Placeholder, null)),
             renderFooter())));
 }
-exports.Modalnew = (0, tango_boot_1.defineComponent)(antd_1.Modal, {
-    name: 'Modalnew',
+exports.Modal = (0, tango_boot_1.defineComponent)(antd_1.Modal, {
+    name: 'Modal',
     designerConfig: {
         render({ designerProps, originalProps }) {
             return react_1.default.createElement(ModalDesigner, Object.assign({}, designerProps, originalProps));

package/lib/cjs/components/result1.js

@@ -9,6 +9,6 @@ const Result = (_a) => {
     var _b = tango_helpers_1.SLOT.id, dataId = _a[_b], _c = tango_helpers_1.SLOT.dnd, dataDnd = _a[_c], rest = tslib_1.__rest(_a, [typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
     console.log("新的结果组件01", dataId, dataDnd, rest);
     return (react_1.default.createElement("div", { "data-dnd": dataDnd, "data-id": dataId, draggable: true },
-        react_1.default.createElement(antd_1.Result, Object.assign({}, rest))));
+        react_1.default.createElement(antd_1.Result, Object.assign({}, rest), " ")));
 };
 exports.Result = Result;

package/lib/cjs/components/result2.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const Result: ({ [SLOT.id]: dataId, [SLOT.dnd]: dataDnd, ...rest }: {
+    [x: string]: any;
+}) => React.JSX.Element;

package/lib/cjs/components/result2.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Result = void 0;
+const tslib_1 = require("tslib");
+const antd_1 = require("antd");
+const react_1 = tslib_1.__importDefault(require("react"));
+const tango_helpers_1 = require("@music163/tango-helpers");
+const Result = (_a) => {
+    var _b = tango_helpers_1.SLOT.id, dataId = _a[_b], _c = tango_helpers_1.SLOT.dnd, dataDnd = _a[_c], rest = tslib_1.__rest(_a, [typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
+    console.log("新的结果组件02", dataId, dataDnd, rest);
+    return (react_1.default.createElement(antd_1.Result, Object.assign({ "data-dnd": dataDnd, "data-id": dataId }, rest), " "));
+};
+exports.Result = Result;

package/lib/cjs/components/result3.d.ts

@@ -0,0 +1,9 @@
+import { ResultProps } from 'antd';
+import React from 'react';
+interface ResultWithDndProps extends ResultProps {
+    ["id"]: string;
+    ["dnd"]: string;
+    extra?: React.ReactNode;
+}
+export declare const Result: React.FC<ResultWithDndProps>;
+export {};

package/lib/cjs/components/result3.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Result = void 0;
+const tslib_1 = require("tslib");
+const antd_1 = require("antd");
+const react_1 = tslib_1.__importStar(require("react"));
+// 静态化ExtraButton组件
+const ExtraButton = (0, react_1.memo)(({ extra }) => {
+    return react_1.default.createElement(react_1.default.Fragment, null, extra);
+});
+const Result = (_a) => {
+    var { ["id"]: dataId, ["dnd"]: dataDnd, extra } = _a, rest = tslib_1.__rest(_a, ["id", "dnd", "extra"]);
+    console.log("结果组件0416001", dataId, dataDnd, extra);
+    return (react_1.default.createElement("div", { "data-dnd": dataDnd, "data-id": dataId, draggable: true },
+        react_1.default.createElement(antd_1.Result, Object.assign({}, rest, { extra: extra ? [react_1.default.createElement(ExtraButton, { key: "btn", extra: extra })] : null }))));
+};
+exports.Result = Result;

package/lib/cjs/prototypes/collapse.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollapsePanel = exports.Collapse = void 0;
+const tslib_1 = require("tslib");
 const common_1 = require("./common");
+const react_1 = tslib_1.__importDefault(require("react"));
+const antd_1 = require("antd");
 exports.Collapse = {
     name: 'Collapse',
     title: '折叠面板',
@@ -9,12 +12,52 @@ exports.Collapse = {
     icon: 'icon-zhediemianban',
     help: '可以折叠/展开的内容区域，对复杂区域进行分组和隐藏，保持页面的整洁',
     type: 'element',
+    hasChildrenItem: true,
     hasChildren: true,
-    childrenName: 'CollapsePanel',
+    childrenName: 'Collapse.Panel',
     initChildren: `<Collapse.Panel  header="panel1" key="1"><Placeholder text="放置替换" /></Collapse.Panel><Collapse.Panel header="panel2" key="2"><Placeholder text="放置替换" /></Collapse.Panel><Collapse.Panel header="panel3" key="3"><Placeholder text="放置替换" /></Collapse.Panel>`,
     relatedImports: ['Placeholder'],
     props: [
         ...common_1.StylePrototypes,
+        {
+            name: 'itemArray',
+            title: '子面板',
+            setter: 'arraySetter',
+            setterProps: {
+                ArrayProps: [
+                    {
+                        label: '面板头内容',
+                        name: 'header',
+                    },
+                    {
+                        label: '对应 activeKey',
+                        name: 'key',
+                    },
+                    // {
+                    //   label: '是否可折叠',
+                    //   name: 'collapsible',
+                    //   component: <Switch />
+                    // },
+                    {
+                        label: '自定义渲染',
+                        name: 'extra',
+                        component: react_1.default.createElement(antd_1.Switch, null)
+                    },
+                    {
+                        label: '隐藏时保留',
+                        name: 'forceRender',
+                        component: react_1.default.createElement(antd_1.Switch, null),
+                        defaultValue: false,
+                    },
+                    {
+                        label: '是否展示当前面板上的箭头',
+                        name: 'showArrow',
+                        component: react_1.default.createElement(antd_1.Switch, null),
+                        defaultValue: true,
+                    },
+                ]
+            }
+        },
         {
             name: 'accordion',
             title: '手风琴模式',

package/lib/cjs/prototypes/descriptions.js

@@ -10,7 +10,7 @@ exports.Descriptions = {
     help: '成组展示多个只读字段，常见于详情页的信息展示',
     type: 'element',
     hasChildren: true,
-    childrenName: 'DescriptionItem',
+    childrenName: 'Description.Item',
     // initChildren: `<DescriptionItem label="标签" content="文本内容" /><DescriptionItem label="标签" content="文本内容" />`,
     // relatedImports: ['DescriptionItem', 'Text'],
     hasChildrenItem: true,

package/lib/cjs/prototypes/drawer.js

@@ -11,7 +11,7 @@ exports.Drawer = {
     package: '@cuvp1225/antd',
     help: '屏幕边缘滑出的浮层面板。',
     hasChildren: true,
-    initChildren: '',
+    initChildren: '<Placeholder></Placeholder>',
     props: [
         ...common_1.StylePrototypes,
         // {

package/lib/cjs/prototypes/form.js

@@ -96,16 +96,20 @@ const formChildren = [{
         label: '时间范围选择框',
     },
     {
-        value: '< UploadImage />',
-        label: '图片上传',
+        value: '< Upload />',
+        label: '上传',
     },
     {
-        value: '< UploadFile />',
-        label: '文件上传',
+        value: '< Rate />',
+        label: '评分',
     },
     {
         value: '< Slider />',
         label: '滑动输入条',
+    },
+    {
+        value: '< Placeholder />',
+        label: '插槽',
     }
 ];
 exports.Form = {
@@ -135,8 +139,8 @@ exports.Form = {
     //   </Button>
     // </Form.Item>`,
     initChildren: '<Form.Item component="Input" label="表单项" ><Placeholder></Placeholder></Form.Item>',
-    relatedImports: ['FormItem', 'FormFooter', 'Button', 'Input'],
-    childrenName: ['FormItem', 'Fieldset', 'FormFooter'],
+    // relatedImports: ['Form.Item', 'FormFooter', 'Button', 'Input'],
+    childrenName: ['Form.Item', 'Fieldset', 'FormFooter'],
     props: [
         ...common_1.StylePrototypes,
         {

package/lib/cjs/prototypes/list.js

@@ -15,7 +15,7 @@ exports.List = {
     type: 'element',
     hasChildren: true,
     hasChildrenItem: true,
-    childrenName: 'ListItem',
+    childrenName: 'List.Item',
     // relatedImports: ['ListItem'],
     initChildren: '<List.Item>列表项</List.Item>',
     props: [

package/lib/cjs/prototypes/row.js

@@ -18,8 +18,8 @@ exports.Row1 = {
         {
             name: 'gutter',
             title: '栅格间隔',
-            setter: 'textSetter',
-            defaultValue: [20, 20]
+            setter: 'expressionSetter',
+            initValue: 16
         },
     ],
     rules: {

package/lib/cjs/prototypes/timeline.js

@@ -17,7 +17,7 @@ exports.Timeline = {
     help: '垂直展示的时间流信息，用于一系列信息需按时间排列时',
     hasChildren: true,
     hasChildrenItem: true,
-    childrenName: 'TimelineItem',
+    childrenName: 'Timeline.Item',
     initChildren: `<Timeline.Item>阶段1</Timeline.Item><Timeline.Item>阶段2</Timeline.Item><Timeline.Item>阶段3</Timeline.Item>`,
     //relatedImports: ['TimelineItem'],
     props: [

package/lib/esm/components/collapse.d.ts

@@ -1,4 +1,3 @@
 import { CollapseProps } from 'antd';
 import React from 'react';
 export declare const Collapse: React.ForwardRefExoticComponent<CollapseProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;
-export declare const CollapsePanel: React.ForwardRefExoticComponent<import("antd").CollapsePanelProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;

package/lib/esm/components/collapse.js

@@ -27,6 +27,6 @@ export const Collapse = defineComponent(AntCollapse, {
         },
     },
 });
-export const CollapsePanel = defineComponent(AntCollapse.Panel, {
-    name: 'CollapsePanel',
-});
+// export const CollapsePanel = defineComponent(AntCollapse.Panel, {
+//     name: 'CollapsePanel',
+// });

package/lib/esm/components/descriptions.d.ts

@@ -1,6 +1,10 @@
 import { DescriptionsProps } from 'antd';
 import React from 'react';
-export declare const Descriptions: ({ items, [SLOT.dnd]: dataDnd, [SLOT.id]: dataId, ...rest }: DescriptionsProps & {
+export declare const Descriptions: ({ items, [SLOT.id]: dataId, [SLOT.dnd]: dataDnd, ...rest }: DescriptionsProps & {
+    [key: string]: any;
+    children?: React.ReactNode;
+}) => React.JSX.Element;
+export declare const DescriptionsItem: ({ ...rest }: DescriptionsProps & {
     [key: string]: any;
     children?: React.ReactNode;
 }) => React.JSX.Element;

package/lib/esm/components/descriptions.js

@@ -46,26 +46,16 @@ import { __rest } from "tslib";
 //         },
 //     },
 // });
-// import { Descriptions as AntDescriptions} from 'antd';
-// import React, {} from 'react';
-// import { SLOT } from '@music163/tango-helpers';
-// export const Descriptions = ({
-//     [SLOT.id]: dataId,
-//     [SLOT.dnd]: dataDnd,
-//     ...rest
-// }) => {
-//     console.log("新的descriptions组件01", dataId, dataDnd, rest);
-//     return (
-//         <div data-dnd={dataDnd} data-id={dataId} draggable={true}>
-//             <AntDescriptions {...rest} > </AntDescriptions>
-//         </div>
-//     )
-// }
 import { Descriptions as AntDescriptions } from 'antd';
 import React from 'react';
 import { SLOT } from '@music163/tango-helpers';
 export const Descriptions = (_a) => {
-    var { items } = _a, _b = SLOT.dnd, dataDnd = _a[_b], _c = SLOT.id, dataId = _a[_c], rest = __rest(_a, ["items", typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
+    var { items } = _a, _b = SLOT.id, dataId = _a[_b], _c = SLOT.dnd, dataDnd = _a[_c], rest = __rest(_a, ["items", typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
+    console.log("新的descriptions组件01", dataId, dataDnd, rest);
     return (React.createElement("div", { "data-dnd": dataDnd, "data-id": dataId, draggable: true },
-        React.createElement(AntDescriptions, Object.assign({}, rest), items.map((item) => (React.createElement(AntDescriptions.Item, { label: item.label, key: item.label }, item.value))))));
+        React.createElement(AntDescriptions, Object.assign({}, rest), items)));
+};
+export const DescriptionsItem = (_a) => {
+    var rest = __rest(_a, []);
+    return React.createElement(AntDescriptions.Item, Object.assign({}, rest), " ");
 };

package/lib/esm/components/index.d.ts

@@ -5,18 +5,17 @@ export { Button, ButtonGroup } from './button';
 export * from './formily';
 export { InputNumber } from './input-number';
 export { Input, TextArea, Password } from './input';
-export { Modalnew } from './modal';
 export * from './page';
 export * from './placeholder';
 export * from './section';
 export { Select } from './select';
 export { Space } from './space';
-export { Result } from './result1';
 export { Drawer } from "./drawer";
 export { DatePicker } from "./date-picker";
 export { Radio, RadioGroup } from "./radio";
 export { Checkbox, CheckboxGroup } from "./checkbox";
 export { Cascader } from "./cascader";
+export { Collapse } from './collapse';
 export { Dropdown, DropdownButton } from './dropdown';
 export { Upload } from "./upload";
 export { Skeleton } from "./skeleton";
@@ -41,7 +40,6 @@ export { AutoComplete } from './auto-complete';
 export { Mentions } from './mentions';
 export { TreeSelect } from './tree-select';
 export { Image } from './image';
-export { Descriptions } from './descriptions';
 export { Tree } from './tree';
 export { Alert } from "./alert";
 export { Progress } from './progress';

package/lib/esm/components/index.js

@@ -9,7 +9,7 @@ export { Button, ButtonGroup } from './button';
 export * from './formily';
 export { InputNumber } from './input-number';
 export { Input, TextArea, Password } from './input';
-export { Modalnew } from './modal';
+//export { Modalnew } from './modal';
 export * from './page';
 export * from './placeholder';
 export * from './section';
@@ -21,7 +21,9 @@ export { Space } from './space';
 //export {Popover} from './popover';
 //export {Tooltip} from './tooltip';
 //export {Result} from './result';
-export { Result } from './result1';
+//export {Result} from './result1';
+//export {Result} from './result2';
+//export {Result} from './result3';
 export { Drawer } from "./drawer";
 export { DatePicker } from "./date-picker";
 export { Radio, RadioGroup } from "./radio";
@@ -37,7 +39,7 @@ export { Cascader } from "./cascader";
 // export { Timeline,TimelineItem } from './timeline1'
 // export { BasicTimeline } from './timeline2'
 //export { Each } from './each'
-//export { Collapse, CollapsePanel } from './collapse'
+export { Collapse } from './collapse';
 //export { List, ListItem } from './list'
 export { Dropdown, DropdownButton } from './dropdown';
 export { Upload } from "./upload";
@@ -68,7 +70,7 @@ export { Mentions } from './mentions';
 export { TreeSelect } from './tree-select';
 export { Image } from './image';
 //export { Tabs } from './tabs'
-export { Descriptions } from './descriptions';
+// export { Descriptions } from './descriptions'
 export { Tree } from './tree';
 export { Alert } from "./alert";
 export { Progress } from './progress';

package/lib/esm/components/modal.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ModalProps } from 'antd';
-export declare const Modalnew: React.ForwardRefExoticComponent<ModalProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;
+export declare const Modal: React.ForwardRefExoticComponent<ModalProps & import("@music163/tango-boot").TangoComponentProps & React.RefAttributes<unknown>>;

package/lib/esm/components/modal.js

@@ -62,8 +62,8 @@ function ModalDesigner(_a) {
             React.createElement("div", { className: "ModalPanelBody" }, children || React.createElement(Placeholder, null)),
             renderFooter())));
 }
-export const Modalnew = defineComponent(AntModal, {
-    name: 'Modalnew',
+export const Modal = defineComponent(AntModal, {
+    name: 'Modal',
     designerConfig: {
         render({ designerProps, originalProps }) {
             return React.createElement(ModalDesigner, Object.assign({}, designerProps, originalProps));

package/lib/esm/components/result1.js

@@ -6,5 +6,5 @@ export const Result = (_a) => {
     var _b = SLOT.id, dataId = _a[_b], _c = SLOT.dnd, dataDnd = _a[_c], rest = __rest(_a, [typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
     console.log("新的结果组件01", dataId, dataDnd, rest);
     return (React.createElement("div", { "data-dnd": dataDnd, "data-id": dataId, draggable: true },
-        React.createElement(AntResult, Object.assign({}, rest))));
+        React.createElement(AntResult, Object.assign({}, rest), " ")));
 };

package/lib/esm/components/result2.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const Result: ({ [SLOT.id]: dataId, [SLOT.dnd]: dataDnd, ...rest }: {
+    [x: string]: any;
+}) => React.JSX.Element;

package/lib/esm/components/result2.js

@@ -0,0 +1,9 @@
+import { __rest } from "tslib";
+import { Result as AntResult } from 'antd';
+import React from 'react';
+import { SLOT } from '@music163/tango-helpers';
+export const Result = (_a) => {
+    var _b = SLOT.id, dataId = _a[_b], _c = SLOT.dnd, dataDnd = _a[_c], rest = __rest(_a, [typeof _b === "symbol" ? _b : _b + "", typeof _c === "symbol" ? _c : _c + ""]);
+    console.log("新的结果组件02", dataId, dataDnd, rest);
+    return (React.createElement(AntResult, Object.assign({ "data-dnd": dataDnd, "data-id": dataId }, rest), " "));
+};

package/lib/esm/components/result3.d.ts

@@ -0,0 +1,9 @@
+import { ResultProps } from 'antd';
+import React from 'react';
+interface ResultWithDndProps extends ResultProps {
+    ["id"]: string;
+    ["dnd"]: string;
+    extra?: React.ReactNode;
+}
+export declare const Result: React.FC<ResultWithDndProps>;
+export {};

package/lib/esm/components/result3.js

@@ -0,0 +1,13 @@
+import { __rest } from "tslib";
+import { Result as AntResult } from 'antd';
+import React, { memo } from 'react';
+// 静态化ExtraButton组件
+const ExtraButton = memo(({ extra }) => {
+    return React.createElement(React.Fragment, null, extra);
+});
+export const Result = (_a) => {
+    var { ["id"]: dataId, ["dnd"]: dataDnd, extra } = _a, rest = __rest(_a, ["id", "dnd", "extra"]);
+    console.log("结果组件0416001", dataId, dataDnd, extra);
+    return (React.createElement("div", { "data-dnd": dataDnd, "data-id": dataId, draggable: true },
+        React.createElement(AntResult, Object.assign({}, rest, { extra: extra ? [React.createElement(ExtraButton, { key: "btn", extra: extra })] : null }))));
+};