@teamix/pro 1.1.4 → 1.1.8

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

@@ -21,6 +21,8 @@ var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
 
 var _2 = require("../../..");
 
+var _utils2 = require("../../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -49,7 +51,8 @@ var ProTableInfo = function ProTableInfo(props) {
   var header = props.header,
       columns = props.columns,
       dataSource = props.dataSource,
-      layout = props.layout,
+      _props$layout = props.layout,
+      layout = _props$layout === void 0 ? {} : _props$layout,
       loading = props.loading,
       result = props.result,
       actionRef = props.actionRef;
@@ -108,7 +111,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.default.createElement(_utils.LabelIconTip, {
           label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -116,7 +119,7 @@ var ProTableInfo = function ProTableInfo(props) {
           icon: item.tooltipIcon
         })), _defineProperty(_data, "value_".concat(index), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, loading && /*#__PURE__*/_react.default.createElement(_2.BaseSkeleton.Info, null), !loading && /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: (0, _utils.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: (0, _utils2.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -177,6 +180,7 @@ var ProTableInfo = function ProTableInfo(props) {
   };
 
   return /*#__PURE__*/_react.default.createElement(_card.default, _objectSpread({
+    compacted: true,
     hoveredShadow: false,
     bordered: false
   }, header), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {

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.d.ts

@@ -4,6 +4,7 @@ import { ProInfoProps } from './typing';
 export * from './typing';
 declare const ProInfo: {
     (props: ProInfoProps): JSX.Element;
+    Group: React.FC<import("./typing").InfoGroupProps>;
     ProInfoGroup: React.FC<import("./typing").InfoGroupProps>;
 };
 export default ProInfo;

package/lib/info/index.js

@@ -20,7 +20,7 @@ var _InfoGroup = _interopRequireDefault(require("./components/InfoGroup"));
 
 require("./index.scss");
 
-var _useInfoRequest2 = _interopRequireDefault(require("./utils/useInfoRequest"));
+var _useInfoRequest = _interopRequireDefault(require("./utils/useInfoRequest"));
 
 var _utils = require("./utils");
 
@@ -64,18 +64,19 @@ var ProInfo = function ProInfo(props) {
       propsActionRef = props.actionRef,
       _props$header = props.header,
       header = _props$header === void 0 ? {} : _props$header,
-      others = _objectWithoutProperties(props, _excluded); // 请求数据
+      others = _objectWithoutProperties(props, _excluded);
 
+  var context = (0, _react.useContext)(_utils.ProInfoGroupContext); // 请求数据
 
-  var _useInfoRequest = (0, _useInfoRequest2.default)({
+  var _ref = context.visible ? context : (0, _useInfoRequest.default)({
     url: url,
     method: method,
     params: params,
     formatResult: formatResult
   }),
-      loading = _useInfoRequest.loading,
-      result = _useInfoRequest.result,
-      _refresh = _useInfoRequest.refresh;
+      loading = _ref.loading,
+      result = _ref.result,
+      _refresh = _ref.refresh;
 
   var actionRef = (0, _react.useRef)(); // 将 Actions 绑定到传入的 propsActionRef 中
 
@@ -116,6 +117,7 @@ var ProInfo = function ProInfo(props) {
   }));
 };
 
+ProInfo.Group = _InfoGroup.default;
 ProInfo.ProInfoGroup = _InfoGroup.default;
 var _default = ProInfo;
 exports.default = _default;

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

@@ -3,6 +3,7 @@ import { ActionGroupProps, IActionButton } from '../actions';
 import { Method } from 'axios';
 import React from 'react';
 import { CardProps } from '../card';
+import { IUseInfoRequestResult } from './utils/useInfoRequest';
 /** ProInfoBaseProps info 基础定义 */
 export declare type ProInfoBaseProps = {
     /** ProColums 定义，取代 Table 的 columns */
@@ -57,7 +58,7 @@ export interface ProInfoItemProps {
     /** 操作组配置 */
     actionSchema?: ActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
-    dataIndex?: string;
+    dataIndex?: string | string[];
     /** 合并行 */
     colSpan?: number;
     /** 是否可被编辑 */
@@ -130,8 +131,8 @@ export declare type HeaderInfoLayoutProps = {
 };
 /** infoGroup */
 export declare type InfoGroupProps = {
-    children?: React.ReactNode[];
-};
+    children?: React.ReactNode[] | React.ReactNode;
+} & Pick<ProInfoBaseProps, 'params' | 'method' | 'url' | 'onSuccess' | 'onError' | 'formatResult'>;
 export declare type TableInfoLayoutProps = {} & HeaderInfoLayoutProps;
 export declare type InfoValueItemProps = {
     infoItem: ProInfoItemProps;
@@ -141,3 +142,16 @@ export declare type InfoValueItemProps = {
 export declare type ProInfoHeaderProps = {
     extra?: CardProps['extra'] | IActionButton[];
 } & Omit<CardProps, 'extra'>;
+/** ProInfoGroupContextProps */
+export declare type ProInfoGroupContextProps = {
+    /** 因为其他数据都为异步。visible 只用作标识 */
+    visible?: boolean;
+    result?: any;
+    layout?: ProInfoBaseProps['layout'];
+    loading?: IUseInfoRequestResult['loading'];
+    refresh?: IUseInfoRequestResult['refresh'];
+    size?: {
+        width?: number;
+        height?: number;
+    };
+};

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

@@ -1,3 +1,12 @@
-/// <reference types="react" />
-import { ProInfoActionType } from '../typing';
+import React from 'react';
+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

@@ -3,8 +3,16 @@
 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 }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -16,4 +24,27 @@ function useActionType(ref, action) {
   var userAction = _objectSpread({}, action);
 
   ref.current = userAction;
+}
+/** ProInfoGroupContext */
+
+
+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);
+    });
+  }
+
+  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;
+                };
             }[];
         }[];
     }[];