@teamix/pro 1.2.18 → 1.2.22

package/lib/table/typing.d.ts

@@ -12,7 +12,7 @@ import React from 'react';
 import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
-declare type ProTableCellFunProp = (value: any, index: number, record: any) => any;
+declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
 declare type ITableCellRender = {
     [key in IFieldRenderProps]?: ProFieldRenderProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
@@ -146,7 +146,7 @@ export declare type ProTableActionType = {
     /** 全屏展示 */
     fullScreen?: () => boolean;
     /** 设置显示列 */
-    setColumn?: (newColumns: ProColumnProps[]) => void;
+    setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -220,6 +220,8 @@ export declare type ProTableDataFilterProps = {
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
+    /** 自定义内容 */
+    content?: React.ReactNode;
 } & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
@@ -235,6 +237,8 @@ export declare type ProTableTopAreaProps = {
     dataFilter?: ProTableDataFilterProps;
     /** 数据过滤区 form 表单模型 */
     dataFilterForm?: FormType;
+    /** 排序、筛选列展示状态 */
+    filterColumnType?: 'dialog' | 'dropdown' | 'auto';
 };
 /** 单个工具栏 */
 export declare type ProTableToolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';

package/lib/table/utils/columnRender.js

@@ -220,7 +220,8 @@ var processRenderFunction = function processRenderFunction() {
   var value = arguments.length > 1 ? arguments[1] : undefined;
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
-  var external = ['linkOnClick', 'link', 'value'];
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

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

@@ -1,4 +1,11 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+export declare function initActionRef(): void;
+/** table 组件内监听 不对外暴露 */
+export declare function on(fun: any, key: string): void;
+/** table 组件内销毁监听 不对外暴露 */
+export declare function off(key: string): void;
+/** table 组件内触发事件 不对外暴露 */
+export declare function emit(key: string, ...args: any): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;

package/lib/table/utils/index.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cloneDeep = cloneDeep;
+exports.emit = emit;
+exports.initActionRef = initActionRef;
+exports.off = off;
+exports.on = on;
 exports.useActionType = useActionType;
 
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
@@ -28,19 +32,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-// 组件内全局状态
+// 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
 var state = {
   fullScreenState: false,
   filterRules: {},
   filterColumns: []
 };
 
-var _initState = (0, _lodash.default)(state); // 组件内全局监听事件
+var _initState = (0, _lodash.default)(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
 
 
 var callback = {
   fullScreenState: {}
-}; // 组件内对全局状态的更改
+};
+var initCallback = (0, _lodash.default)(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内监听事件
+// 组件内对全局状态的更改
 
 var mutations = {
   getState: function getState() {
@@ -140,7 +148,41 @@ var useOn = function useOn(state) {
       }
     });
   }
-};
+}; // 初始化 actionRef
+
+
+function initActionRef() {
+  state = (0, _lodash.default)(_initState);
+  callback = (0, _lodash.default)(initCallback);
+}
+/** table 组件内监听 不对外暴露 */
+
+
+function on(fun, key) {
+  tableCallback[key] = fun;
+}
+/** table 组件内销毁监听 不对外暴露 */
+
+
+function off(key) {
+  if (tableCallback[key]) {
+    delete tableCallback[key];
+  }
+}
+/** table 组件内触发事件 不对外暴露 */
+
+
+function emit(key) {
+  var fun = tableCallback[key];
+
+  if (fun) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
+    }
+
+    fun.apply(void 0, args);
+  }
+}
 
 function useActionType(ref, action) {
   // 合并自定义事件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.18",
+  "version": "1.2.22",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -24,9 +24,9 @@
   "dependencies": {
     "@formily/core": "2.0.5",
     "@formily/react": "2.0.5",
-    "@teamix/formily": "2.0.5-1",
+    "@teamix/formily": "2.0.5-2",
     "@teamix/hooks": "^0.1.0",
-    "@teamix/pop-confirm": "^1.2.2",
+    "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",
     "@teamix/pro-page-container": "^1.0.0",
     "@teamix/pro-skeleton": "^1.0.0",