@teamix/pro 1.5.18-beta → 1.5.18-beta.1

package/es/index.js

@@ -36,7 +36,7 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.5.19';
+var version = '1.5.18-beta.1';
 
 // By TeamixTest
 window.postMessage({

package/es/table/index.js

@@ -40,7 +40,6 @@ import CardView from './components/CardView';
 import { useUrlState } from '@teamix/hooks';
 import { getUrlStateFilter } from './utils/util';
 export * from './typing';
-console.log('ProTable hello12');
 var cls = usePrefixCls('teamix-pro-table');
 
 /**
@@ -91,7 +90,6 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 var ProTable = function ProTable(props) {
   var _urlState$currentPage, _rowSelection$selecte;
-  console.log('ProTable---');
   var header = props.header,
     className = props.className,
     tableClassName = props.tableClassName,
@@ -714,11 +712,9 @@ var ProTable = function ProTable(props) {
     propsActionRef.current = actionRef.current;
   }
   function reGenFilteredColumnsByAutoWidth() {
-    console.log('[ autoWidth ] >', autoWidth);
     if (!autoWidth) {
       return;
     }
-    console.log('[ 表格计算 ] >');
     console.time('calc width');
     setShowShadowContainer(true);
     var authWidthedColumns = genAutoWidthColumns(filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
@@ -988,7 +984,6 @@ var ProTable = function ProTable(props) {
     }
   };
   var renderTable = function renderTable(isFullScreen) {
-    console.log('propsColumns', propsColumns);
     if (propsColumns) {
       return /*#__PURE__*/React.createElement("div", {
         className: classNames('teamix-pro-table-container', className, 'teamix-test-request'),
@@ -1213,4 +1208,9 @@ var ProTable = function ProTable(props) {
     }), hasActionColumn && shadowActionColumnContainer(filteredColumns, shadowActionColumnContainerRef), renderTable(isFullScreen), fixFooterState && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
   });
 };
+
+// window.TeamixMaterial = {
+//   ...window.TeamixMaterial,
+//   ProTable
+// }
 export default ProTable;

package/es/table/utils/columnRender.js

@@ -20,6 +20,7 @@ import { getTargetValue } from '@teamix/utils';
 import { ProActionGroup } from '../../actions';
 import ProField, { LabelIconTip } from '../../field';
 import Filter from '../components/Filter';
+import { getProFieldWidth } from '@teamix/pro-field';
 /**
  * 增加了 icon 的功能 render title
  */
@@ -194,13 +195,14 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
     proFieldWidthType: valueType
   }, props));
 };
-export var renderCellSmartWidth = function renderCellSmartWidth(value, item, index, record, actionRef, context) {
+export var renderCellSmartWidth = function renderCellSmartWidth(value, item, index, record
+// actionRef: React.MutableRefObject<ProTableActionType | undefined>,
+/** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
+// context?: any,
+) {
   var _item$valueType2 = item.valueType,
     valueType = _item$valueType2 === void 0 ? 'text' : _item$valueType2,
-    render = item.render,
-    actionSchema = item.actionSchema,
-    dataIndex = item.dataIndex,
-    format = item.format;
+    render = item.render;
   var newRender = null;
   var newDataSource = null;
   var props = item.props;
@@ -233,6 +235,7 @@ export var renderCellSmartWidth = function renderCellSmartWidth(value, item, ind
       });
     }
   }
+  return getProFieldWidth(valueType, newRender);
   // return getProFieldWidthBox(valueType, newRender)?.minWidth || undefined
 };
 

package/es/table/utils/genAutoWidthColumns.js

@@ -13,6 +13,8 @@ import { getTargetValue } from '@teamix/utils';
 import { renderCell } from './pureColumnRender';
 import { renderColumnsTitle } from './columnRender';
 import { ProActionGroup } from '../../actions';
+import { getProFieldWidth } from '@teamix/pro-field';
+import { renderCellSmartWidth } from './columnRender';
 
 // 最大宽度
 var maxColumnWidth = 600;
@@ -138,6 +140,8 @@ export var shadowContainer = function shadowContainer(props) {
       !computeableWidthTypeList[valueType] &&
       //@ts-ignore
       !fixedWidthTypeList[valueType] && data.map(function (item, index) {
+        // @ts-ignore
+        column.smartWidth = renderCellSmartWidth(getValueFromRecord(dataIndex, item), column, index, item);
         return renderCell(getValueFromRecord(dataIndex, item), column, index, item);
       }));
     }
@@ -184,20 +188,23 @@ function getValueFromRecord(dataIndex, record) {
 
 // TODO 某些可以直接算出结果的 profield 类型白名单，待补充，每个类型下支持一个函数，用当前值和渲染类型算出一个结果
 export var computeableWidthTypeList = {
-  // text: (data: any[], render: ITableCellRender) => {
-  // }
+  dateTime: function dateTime(data, render) {
+    var result = getProFieldWidth('dateTime', render);
+    // @ts-ignore
+    return (result === null || result === void 0 ? void 0 : result.minWidth) || 0;
+  }
 };
 
 // TODO 某些固定宽度的 profield 类型白名单，这里的数据可能需要综合考虑 dataFold 和 render.rows
 export var fixedWidthTypeList = {
   // 时间日期
-  dateTime: 160,
-  dateMonth: 74,
-  dateWeek: 74,
-  date: 100,
-  dateYear: 46,
-  dateQuarter: 64,
-  dateRange: 212,
+  // dateTime: 142,
+  // dateMonth: 74, // 60
+  // dateWeek: 74,
+  // date: 100,
+  // dateYear: 46,
+  // dateQuarter: 64,
+  // dateRange: 212,
   dateWeekRange: 156,
   dateMonthRange: 156,
   dateYearRange: 102,

package/lib/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.19";
+declare const version = "1.5.18-beta.1";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -280,7 +280,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.19';
+var version = '1.5.18-beta.1';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/table/index.js

@@ -60,7 +60,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
-console.log('ProTable hello12');
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
 /**
  * 处理原生传入的 columns 以便于 选择列 方便处理
@@ -109,7 +108,6 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 var ProTable = function ProTable(props) {
   var _urlState$currentPage, _rowSelection$selecte;
-  console.log('ProTable---');
   var header = props.header,
     className = props.className,
     tableClassName = props.tableClassName,
@@ -706,11 +704,9 @@ var ProTable = function ProTable(props) {
     propsActionRef.current = actionRef.current;
   }
   function reGenFilteredColumnsByAutoWidth() {
-    console.log('[ autoWidth ] >', autoWidth);
     if (!autoWidth) {
       return;
     }
-    console.log('[ 表格计算 ] >');
     console.time('calc width');
     setShowShadowContainer(true);
     var authWidthedColumns = (0, _genAutoWidthColumns.genAutoWidthColumns)(filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
@@ -973,7 +969,6 @@ var ProTable = function ProTable(props) {
     }
   };
   var renderTable = function renderTable(isFullScreen) {
-    console.log('propsColumns', propsColumns);
     if (propsColumns) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)('teamix-pro-table-container', className, 'teamix-test-request'),
@@ -1194,5 +1189,9 @@ var ProTable = function ProTable(props) {
     }), hasActionColumn && (0, _genAutoWidthColumns.shadowActionColumnContainer)(filteredColumns, shadowActionColumnContainerRef), renderTable(isFullScreen), fixFooterState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
   });
 };
+// window.TeamixMaterial = {
+//   ...window.TeamixMaterial,
+//   ProTable
+// }
 var _default = ProTable;
 exports.default = _default;

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

@@ -11,4 +11,4 @@ export declare const renderColumnsTitle: (item: ProTableColumnProps, actionRef:
  * 负责单元格的具体渲染
  */
 export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any, dataTeamixSpm?: string) => JSX.Element;
-export declare const renderCellSmartWidth: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any) => void;
+export declare const renderCellSmartWidth: (value: any, item: ProTableColumnProps, index: number, record: any) => 0 | import("@teamix/pro-field/lib/autoWidth/typing").ProFieldAutoWidthPropsItem;

package/lib/table/utils/columnRender.js

@@ -10,6 +10,7 @@ var _utils = require("@teamix/utils");
 var _actions = require("../../actions");
 var _field = _interopRequireWildcard(require("../../field"));
 var _Filter = _interopRequireDefault(require("../components/Filter"));
+var _proField = require("@teamix/pro-field");
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -199,14 +200,10 @@ dataTeamixSpm) {
   }, props));
 };
 exports.renderCell = renderCell;
-var renderCellSmartWidth = function renderCellSmartWidth(value, item, index, record, actionRef, /** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
-context) {
+var renderCellSmartWidth = function renderCellSmartWidth(value, item, index, record) {
   var _item$valueType2 = item.valueType,
     valueType = _item$valueType2 === void 0 ? 'text' : _item$valueType2,
-    render = item.render,
-    actionSchema = item.actionSchema,
-    dataIndex = item.dataIndex,
-    format = item.format;
+    render = item.render;
   var newRender = null;
   var newDataSource = null;
   var props = item.props;
@@ -239,6 +236,7 @@ context) {
       });
     }
   }
+  return (0, _proField.getProFieldWidth)(valueType, newRender);
   // return getProFieldWidthBox(valueType, newRender)?.minWidth || undefined
 };
 /**

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

@@ -1,5 +1,5 @@
 import { MutableRefObject } from 'react';
-import { ProTableColumnProps } from '../typing';
+import { ProTableColumnProps, ITableCellRender } from '../typing';
 /**
  * @param fileteredColumns
  * @param ref
@@ -14,15 +14,10 @@ interface IShadowContainerProps {
 }
 export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element;
 export declare const shadowActionColumnContainer: (columns: ProTableColumnProps[], shadowActionColumnContainerRef: MutableRefObject<null>) => JSX.Element | undefined;
-export declare const computeableWidthTypeList: {};
+export declare const computeableWidthTypeList: {
+    dateTime: (data: any[], render: ITableCellRender) => any;
+};
 export declare const fixedWidthTypeList: {
-    dateTime: number;
-    dateMonth: number;
-    dateWeek: number;
-    date: number;
-    dateYear: number;
-    dateQuarter: number;
-    dateRange: number;
     dateWeekRange: number;
     dateMonthRange: number;
     dateYearRange: number;

package/lib/table/utils/genAutoWidthColumns.js

@@ -12,6 +12,7 @@ var _utils = require("@teamix/utils");
 var _pureColumnRender = require("./pureColumnRender");
 var _columnRender = require("./columnRender");
 var _actions = require("../../actions");
+var _proField = require("@teamix/pro-field");
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -146,6 +147,8 @@ var shadowContainer = function shadowContainer(props) {
       !computeableWidthTypeList[valueType] &&
       //@ts-ignore
       !fixedWidthTypeList[valueType] && data.map(function (item, index) {
+        // @ts-ignore
+        column.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
         return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), column, index, item);
       }));
     }
@@ -191,20 +194,23 @@ function getValueFromRecord(dataIndex, record) {
 }
 // TODO 某些可以直接算出结果的 profield 类型白名单，待补充，每个类型下支持一个函数，用当前值和渲染类型算出一个结果
 var computeableWidthTypeList = {
-  // text: (data: any[], render: ITableCellRender) => {
-  // }
+  dateTime: function dateTime(data, render) {
+    var result = (0, _proField.getProFieldWidth)('dateTime', render);
+    // @ts-ignore
+    return (result === null || result === void 0 ? void 0 : result.minWidth) || 0;
+  }
 };
 // TODO 某些固定宽度的 profield 类型白名单，这里的数据可能需要综合考虑 dataFold 和 render.rows
 exports.computeableWidthTypeList = computeableWidthTypeList;
 var fixedWidthTypeList = {
   // 时间日期
-  dateTime: 160,
-  dateMonth: 74,
-  dateWeek: 74,
-  date: 100,
-  dateYear: 46,
-  dateQuarter: 64,
-  dateRange: 212,
+  // dateTime: 142,
+  // dateMonth: 74, // 60
+  // dateWeek: 74,
+  // date: 100,
+  // dateYear: 46,
+  // dateQuarter: 64,
+  // dateRange: 212,
   dateWeekRange: 156,
   dateMonthRange: 156,
   dateYearRange: 102,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.18-beta",
+  "version": "1.5.18-beta.1",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",