@teamix/pro 1.1.6 → 1.1.7

package/lib/info/components/tableInfo/index.scss

@@ -6,7 +6,7 @@
     padding: 16px 24px;
   }
   .next-table-row.hovered {
-    background-color:var(--color-white);
+    background-color:var(--color-fill1-1);
   }
   .next-table-row {
     color: var(--color-text1-3, #333333);

package/lib/info/index.scss

@@ -5,4 +5,8 @@
   .teamix-pro-card-content {
     padding-bottom: 8px;
   }
+
+  .next-card {
+    background: none;
+  }
 }

package/lib/info/typing.d.ts

@@ -58,7 +58,7 @@ export interface ProInfoItemProps {
     /** 操作组配置 */
     actionSchema?: ActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
-    dataIndex?: string;
+    dataIndex?: string | string[];
     /** 合并行 */
     colSpan?: number;
     /** 是否可被编辑 */

package/lib/info/utils/index.d.ts

@@ -1,5 +1,12 @@
 import React from 'react';
-import { ProInfoActionType, ProInfoGroupContextProps } from '../typing';
+import { ProInfoActionType, ProInfoGroupContextProps, ProInfoItemProps } from '../typing';
 export declare function useActionType<T>(ref: React.MutableRefObject<ProInfoActionType | undefined>, action: ProInfoActionType): void;
 /** ProInfoGroupContext */
 export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps>;
+/**
+ * 获取 dataIndex 值
+ * @param dataIndex
+ * @param dataSource
+ * @returns
+ */
+export declare function getDataIndexValue(dataIndex: ProInfoItemProps['dataIndex'], dataSource: object): any;

package/lib/info/utils/index.js

@@ -4,8 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProInfoGroupContext = void 0;
+exports.getDataIndexValue = getDataIndexValue;
 exports.useActionType = useActionType;
 
+var _utils = require("@teamix/utils");
+
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26,5 +29,22 @@ function useActionType(ref, action) {
 
 
 var ProInfoGroupContext = /*#__PURE__*/_react.default.createContext({});
+/**
+ * 获取 dataIndex 值
+ * @param dataIndex
+ * @param dataSource
+ * @returns
+ */
+
+
+exports.ProInfoGroupContext = ProInfoGroupContext;
+
+function getDataIndexValue(dataIndex, dataSource) {
+  if (Array.isArray(dataIndex)) {
+    return dataIndex.map(function (item) {
+      return (0, _utils.getDeepValue)(item !== null && item !== void 0 ? item : '', dataSource);
+    });
+  }
 
-exports.ProInfoGroupContext = ProInfoGroupContext;
+  return (0, _utils.getDeepValue)(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
+}

package/lib/nocode/configurators/PageHeader.js

@@ -111,34 +111,37 @@ var schema = [{
         children: [{
           name: 'tags',
           component: 'ArrayTable',
-          items: [{
-            name: 'text',
-            title: '名称',
-            component: 'Input'
-          }, {
-            name: 'type',
-            title: '类型',
-            component: 'Select',
-            dataSource: [{
-              label: '普通',
-              value: 'normal'
+          items: {
+            type: 'object',
+            children: [{
+              name: 'text',
+              title: '名称',
+              component: 'Input'
+            }, {
+              name: 'type',
+              title: '类型',
+              component: 'Select',
+              dataSource: [{
+                label: '普通',
+                value: 'normal'
+              }, {
+                label: '主要',
+                value: 'primary'
+              }]
+            }, {
+              name: 'color',
+              title: '颜色',
+              component: 'Input'
             }, {
-              label: '主要',
-              value: 'primary'
+              title: '操作',
+              component: 'ArrayTable.Remove',
+              decoratorProps: {
+                fixed: 'right',
+                width: 40
+              },
+              formItem: null
             }]
-          }, {
-            name: 'color',
-            title: '颜色',
-            component: 'Input'
-          }, {
-            title: '操作',
-            component: 'ArrayTable.Remove',
-            decoratorProps: {
-              fixed: 'right',
-              width: 40
-            },
-            formItem: null
-          }],
+          },
           children: [{
             title: '添加标签'
           }]
@@ -154,23 +157,26 @@ var schema = [{
         children: [{
           name: 'breadcrumb',
           component: 'ArrayTable',
-          items: [{
-            name: 'text',
-            title: '名称',
-            component: 'Input'
-          }, {
-            name: 'link',
-            title: '链接',
-            component: 'Input'
-          }, {
-            title: '操作',
-            component: 'ArrayTable.Remove',
-            decoratorProps: {
-              fixed: 'right',
-              width: 40
-            },
-            formItem: null
-          }],
+          items: {
+            type: 'object',
+            children: [{
+              name: 'text',
+              title: '名称',
+              component: 'Input'
+            }, {
+              name: 'link',
+              title: '链接',
+              component: 'Input'
+            }, {
+              title: '操作',
+              component: 'ArrayTable.Remove',
+              decoratorProps: {
+                fixed: 'right',
+                width: 40
+              },
+              formItem: null
+            }]
+          },
           children: [{
             title: '添加面包屑'
           }]

package/lib/nocode/configurators/ProTable.js

@@ -141,16 +141,19 @@ var schema = [{
           name: 'pageSizeList',
           title: '分页大小列表',
           component: 'ArrayItems',
-          props: {
-            itemType: 'string'
+          items: {
+            component: 'FormFlex',
+            children: [{
+              component: 'ArrayItems.SortHandle'
+            }, {
+              component: 'NumberPicker',
+              decoratorProps: {
+                feedbackLayout: 'none'
+              }
+            }, {
+              component: 'ArrayItems.Remove'
+            }]
           },
-          items: [{
-            component: 'ArrayItems.SortHandle'
-          }, {
-            component: 'NumberPicker'
-          }, {
-            component: 'ArrayItems.Remove'
-          }],
           children: [{
             title: '添加一条'
           }],

package/lib/nocode/configurators/common.d.ts

@@ -4,53 +4,57 @@ export declare function array(title: string, name: string, fields: any[], main?:
         name: string;
         title: string | undefined;
         component: string;
-        props: {
-            itemType: string;
-        };
-        items: ({
-            component: string;
-            children: {
-                component: string;
-            }[];
-            name?: undefined;
-            type?: undefined;
-            title?: undefined;
-            reactions?: undefined;
-        } | {
-            name: string;
-            component: string;
+        items: {
             type: string;
-            title: string;
-            reactions: {
-                dependencies: string[];
-                fulfill: {
-                    schema: {
-                        title: string;
-                    };
-                };
-            };
-            children: {
+            decorator: string;
+            children: ({
+                component: string;
+                children: {
+                    component: string;
+                }[];
+                name?: undefined;
+                type?: undefined;
+                title?: undefined;
+                reactions?: undefined;
+            } | {
                 name: string;
                 component: string;
-                props: {
-                    layout: string;
-                    labelAlign: string;
-                    colon: boolean;
-                    labelCol: number;
-                    wrapperCol: number;
+                type: string;
+                title: string;
+                reactions: {
+                    dependencies: string[];
+                    fulfill: {
+                        schema: {
+                            title: string;
+                        };
+                    };
                 };
-                children: any[];
-            }[];
-        } | {
-            component: string;
-            children?: undefined;
-            name?: undefined;
-            type?: undefined;
-            title?: undefined;
-            reactions?: undefined;
-        })[];
+                children: {
+                    name: string;
+                    component: string;
+                    props: {
+                        layout: string;
+                        labelAlign: string;
+                        colon: boolean;
+                        labelCol: number;
+                        wrapperCol: number;
+                    };
+                    children: any[];
+                }[];
+            } | {
+                component: string;
+                children?: undefined;
+                name?: undefined;
+                type?: undefined;
+                title?: undefined;
+                reactions?: undefined;
+            })[];
+        };
         children: {
-            title: string;
+            component: string;
+            props: {
+                title: string;
+            };
         }[];
     }[];
 };
@@ -64,69 +68,10 @@ export declare function actions(props?: {
         name: string;
         title: string | undefined;
         component: string;
-        props: {
-            itemType: string;
-        };
-        items: ({
-            component: string;
-            children: {
-                component: string;
-            }[];
-            name?: undefined;
-            type?: undefined;
-            title?: undefined;
-            reactions?: undefined;
-        } | {
-            name: string;
-            component: string;
+        items: {
             type: string;
-            title: string;
-            reactions: {
-                dependencies: string[];
-                fulfill: {
-                    schema: {
-                        title: string;
-                    };
-                };
-            };
-            children: {
-                name: string;
-                component: string;
-                props: {
-                    layout: string;
-                    labelAlign: string;
-                    colon: boolean;
-                    labelCol: number;
-                    wrapperCol: number;
-                };
-                children: any[];
-            }[];
-        } | {
-            component: string;
-            children?: undefined;
-            name?: undefined;
-            type?: undefined;
-            title?: undefined;
-            reactions?: undefined;
-        })[];
-        children: {
-            title: string;
-        }[];
-    }[];
-};
-export declare function filter(name: string): {
-    name: string;
-    type: string;
-    children: {
-        title: string;
-        children: {
-            name: string;
-            title: string | undefined;
-            component: string;
-            props: {
-                itemType: string;
-            };
-            items: ({
+            decorator: string;
+            children: ({
                 component: string;
                 children: {
                     component: string;
@@ -168,8 +113,75 @@ export declare function filter(name: string): {
                 title?: undefined;
                 reactions?: undefined;
             })[];
-            children: {
+        };
+        children: {
+            component: string;
+            props: {
                 title: string;
+            };
+        }[];
+    }[];
+};
+export declare function filter(name: string): {
+    name: string;
+    type: string;
+    children: {
+        title: string;
+        children: {
+            name: string;
+            title: string | undefined;
+            component: string;
+            items: {
+                type: string;
+                decorator: string;
+                children: ({
+                    component: string;
+                    children: {
+                        component: string;
+                    }[];
+                    name?: undefined;
+                    type?: undefined;
+                    title?: undefined;
+                    reactions?: undefined;
+                } | {
+                    name: string;
+                    component: string;
+                    type: string;
+                    title: string;
+                    reactions: {
+                        dependencies: string[];
+                        fulfill: {
+                            schema: {
+                                title: string;
+                            };
+                        };
+                    };
+                    children: {
+                        name: string;
+                        component: string;
+                        props: {
+                            layout: string;
+                            labelAlign: string;
+                            colon: boolean;
+                            labelCol: number;
+                            wrapperCol: number;
+                        };
+                        children: any[];
+                    }[];
+                } | {
+                    component: string;
+                    children?: undefined;
+                    name?: undefined;
+                    type?: undefined;
+                    title?: undefined;
+                    reactions?: undefined;
+                })[];
+            };
+            children: {
+                component: string;
+                props: {
+                    title: string;
+                };
             }[];
         }[];
     }[];

package/lib/nocode/configurators/common.js

@@ -14,46 +14,50 @@ function array(title, name, fields, main, arrayTitle) {
       name: name,
       title: arrayTitle,
       component: 'ArrayItems',
-      props: {
-        itemType: 'card'
-      },
-      items: [{
-        component: 'FormFlex',
+      items: {
+        type: 'object',
+        decorator: 'ArrayItems.Item',
         children: [{
-          component: 'ArrayItems.SortHandle'
+          component: 'FormFlex',
+          children: [{
+            component: 'ArrayItems.SortHandle'
+          }, {
+            component: 'ArrayItems.Index'
+          }]
         }, {
-          component: 'ArrayItems.Index'
-        }]
-      }, {
-        name: 'drawer',
-        component: 'Editable.Drawer',
-        type: 'void',
-        title: '编辑详情',
-        reactions: {
-          dependencies: [".drawer.layout.".concat(main ? main : fields[0].name)],
-          fulfill: {
-            schema: {
-              title: '{{$deps[0]}}'
+          name: 'drawer',
+          component: 'Editable.Drawer',
+          type: 'void',
+          title: '编辑详情',
+          reactions: {
+            dependencies: [".drawer.layout.".concat(main ? main : fields[0].name)],
+            fulfill: {
+              schema: {
+                title: '{{$deps[0]}}'
+              }
             }
-          }
-        },
-        children: [{
-          name: 'layout',
-          component: 'FormLayout',
-          props: {
-            layout: 'vertical',
-            labelAlign: 'left',
-            colon: false,
-            labelCol: 24,
-            wrapperCol: 24
           },
-          children: fields
+          children: [{
+            name: 'layout',
+            component: 'FormLayout',
+            props: {
+              layout: 'vertical',
+              labelAlign: 'left',
+              colon: false,
+              labelCol: 24,
+              wrapperCol: 24
+            },
+            children: fields
+          }]
+        }, {
+          component: 'ArrayItems.Remove'
         }]
-      }, {
-        component: 'ArrayItems.Remove'
-      }],
+      },
       children: [{
-        title: '添加一条'
+        component: 'ArrayItems.Addition',
+        props: {
+          title: '添加一条'
+        }
       }]
     }]
   };

package/lib/table/components/Filter/index.js

@@ -51,7 +51,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var CheckboxItem = _components.Menu.CheckboxItem;
 var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter');
-var RadioGroup = _components.Radio.Group;
+var RadioItem = _components.Menu.RadioItem;
 
 var Filter = function Filter(props) {
   var column = props.column,
@@ -105,27 +105,19 @@ var Filter = function Filter(props) {
   }, []); // 渲染单选
 
   var renderSingle = function renderSingle() {
-    var _selected$;
-
-    return /*#__PURE__*/_react.default.createElement(RadioGroup, {
-      value: (_selected$ = selected === null || selected === void 0 ? void 0 : selected[0]) !== null && _selected$ !== void 0 ? _selected$ : '',
-      onChange: function onChange(check) {
-        setSelected([check]);
-      }
-    }, filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
       var label = _ref3.label,
           value = _ref3.value;
       var valueStr = value.toString();
-      return /*#__PURE__*/_react.default.createElement(_components.Radio, {
+      return /*#__PURE__*/_react.default.createElement(RadioItem, {
         id: valueStr,
-        value: valueStr,
+        checked: selected.includes(valueStr),
         key: valueStr,
-        style: {
-          display: 'block',
-          marginLeft: '5px'
+        onChange: function onChange(check) {
+          setSelected([valueStr]);
         }
       }, label);
-    }));
+    });
   }; // 渲染多选
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@teamix/pro",
-  "version": "1.1.6",
-  "description": "pro大包",
+  "version": "1.1.7",
+  "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
   "license": "MIT",