@teamix/pro 1.1.6 → 1.1.7

package/es/info/components/tableInfo/index.js

@@ -21,9 +21,10 @@ import './index.scss';
 import { Table } from '@alicloudfe/components';
 import './index.scss';
 import ProCard from '../../../card';
-import { getTargetValue, LabelIconTip } from '@teamix/utils';
+import { LabelIconTip } from '@teamix/utils';
 import InfoValueItem from '../InfoValueItem';
 import { BaseSkeleton } from '../../..';
+import { getDataIndexValue } from '../../utils';
 
 var ProTableInfo = function ProTableInfo(props) {
   var header = props.header,
@@ -89,7 +90,7 @@ var ProTableInfo = function ProTableInfo(props) {
       }
 
       var itemData = filterColumns.map(function (item, index) {
-        var _item$title, _item$valueType, _item$dataIndex, _data;
+        var _item$title, _item$valueType, _data;
 
         var data = (_data = {}, _defineProperty(_data, "label_".concat(index), /*#__PURE__*/React.createElement(LabelIconTip, {
           label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -97,7 +98,7 @@ var ProTableInfo = function ProTableInfo(props) {
           icon: item.tooltipIcon
         })), _defineProperty(_data, "value_".concat(index), /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement(BaseSkeleton.Info, null), !loading && /*#__PURE__*/React.createElement(InfoValueItem, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: getTargetValue("{{".concat((_item$dataIndex = item === null || item === void 0 ? void 0 : item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : '', "}}"), dataSource !== null && dataSource !== void 0 ? dataSource : result),
+          value: getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,

package/es/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/es/info/index.scss

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

package/es/info/typing.d.ts

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

package/es/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/es/info/utils/index.js

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+import { getDeepValue } from '@teamix/utils';
 import React from 'react';
 export function useActionType(ref, action) {
   // 合并自定义事件
@@ -13,4 +14,20 @@ export function useActionType(ref, action) {
 }
 /** ProInfoGroupContext */
 
-export var ProInfoGroupContext = /*#__PURE__*/React.createContext({});
+export var ProInfoGroupContext = /*#__PURE__*/React.createContext({});
+/**
+ * 获取 dataIndex 值
+ * @param dataIndex
+ * @param dataSource
+ * @returns
+ */
+
+export function getDataIndexValue(dataIndex, dataSource) {
+  if (Array.isArray(dataIndex)) {
+    return dataIndex.map(function (item) {
+      return getDeepValue(item !== null && item !== void 0 ? item : '', dataSource);
+    });
+  }
+
+  return getDeepValue(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
+}

package/es/nocode/configurators/PageHeader.js

@@ -103,34 +103,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: '添加标签'
           }]
@@ -146,23 +149,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/es/nocode/configurators/ProTable.js

@@ -133,16 +133,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/es/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/es/nocode/configurators/common.js

@@ -5,46 +5,50 @@ export 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/es/table/components/Filter/index.js

@@ -26,12 +26,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useMemo, useState } from 'react';
 import TeamixIcon from '@teamix/icon';
-import { Button, Dropdown, Menu, Radio } from '@alicloudfe/components';
+import { Button, Dropdown, Menu } from '@alicloudfe/components';
 import { baseClass } from '@teamix/utils';
 import './index.scss';
 var CheckboxItem = Menu.CheckboxItem;
 var cls = baseClass('teamix-pro-table-toolbar-filter');
-var RadioGroup = Radio.Group;
+var RadioItem = Menu.RadioItem;
 
 var Filter = function Filter(props) {
   var column = props.column,
@@ -85,27 +85,19 @@ var Filter = function Filter(props) {
   }, []); // 渲染单选
 
   var renderSingle = function renderSingle() {
-    var _selected$;
-
-    return /*#__PURE__*/React.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.createElement(Radio, {
+      return /*#__PURE__*/React.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/lib/form/ProForm/index.scss

@@ -37,9 +37,13 @@ $form-item-cls: #{$css-prefix}formily-item;
         > .teamix-pro-field-checkbox,
         .teamix-pro-field-radio,
         .teamix-pro-field-switch,
-        .teamix-pro-field-colorradio {
+        .teamix-pro-field-colorradio,
+        .#{$css-prefix}btn-text {
           line-height: var(--form-element-medium-height, 32px);
         }
+        > .#{$css-prefix}btn-text {
+          width: auto;
+        }
       }
     }
   }
@@ -93,9 +97,11 @@ $form-item-cls: #{$css-prefix}formily-item;
     .#{$form-item-cls}-control-content {
       .#{$form-item-cls}-addon-before {
         margin-right: 16px;
+        color: var(--color-text1-8, #848484);
       }
       .#{$form-item-cls}-addon-after {
         margin-left: 16px;
+        color: var(--color-text1-8, #848484);
       }
     }
   }

package/lib/form/SchemaForm/index.js

@@ -277,9 +277,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
         properties: formatSchema(children)
-      } : {}; // 递归items（类似子组件）
+      } : {}; // 递归items（类似子组件，会先由各initialize方法格式化为固定形式，type不同不统一处理）
+      // 例如：[{ name: 'items', type: 'object', children: items }]
 
-      var recursiveItems = items ? formatSchema(items) : {}; // 配置组件属性
+      var recursiveItems = items ? formatSchema([items]) : {}; // 配置组件属性
 
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, otherProps), formatParam), recursiveProperties), recursiveItems);
     });