@yilianjituan/yilian_dgerm 1.0.5-alpha.7 → 1.0.5-alpha.8

package/dist/components/PageTemplate/index.interface.d.ts

@@ -39,7 +39,7 @@ export interface IPageTemPropsData {
 }
 export interface IColumnsProps {
     title: string;
-    dataIndex?: string;
+    dataIndex?: any;
     render?: typeEmptyFunc | ((text: string | number, record: any, index: string | number) => any);
     [name: string]: typeEmptyFunc | string | boolean | undefined | number | any;
 }

package/dist/components/PageTemplate/index.js

@@ -156,7 +156,7 @@ var PageTemplate = function PageTemplate(props, ref) {
         key: 'rowIndex',
         align: 'center',
         fixed: 'left',
-        minWidth: 70,
+        width: 70,
         ellipsis: {
           showTitle: false
         },
@@ -168,8 +168,9 @@ var PageTemplate = function PageTemplate(props, ref) {
     }
     _columns = _columns.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
-        minWidth: item.minWidth || item.title.length * 20 + 20,
-        ellipsis: typeof item.ellipsis === 'boolean' ? item.ellipsis : true,
+        minWidth: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? undefined : item.minWidth || item.title.length * 20 + 20,
+        width: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? 70 : item.width,
+        ellipsis: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? false : typeof item.ellipsis === 'boolean' ? item.ellipsis : true,
         align: item.align || 'center',
         fixed: item.fixed || (['action', 'operation', 'handle', 'handle_box'].includes(item.dataIndex) ? 'right' : ['rowIndex'].includes(item.key) ? 'left' : undefined)
       });

package/dist/components/PageTemplate/resizable/index.js

@@ -188,8 +188,9 @@ var CustomTable = function CustomTable(props) {
     var _columns = _toConsumableArray(columns);
     _columns = _columns.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
-        minWidth: item.minWidth || item.title.length * 20 + 20,
-        ellipsis: typeof item.ellipsis === 'boolean' ? item.ellipsis : true,
+        minWidth: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? undefined : item.minWidth || item.title.length * 20 + 20,
+        width: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? 70 : item.width,
+        ellipsis: ['index', 'rowIndex'].includes(item.key) || ['index', 'rowIndex'].includes(item.dataIndex) ? false : typeof item.ellipsis === 'boolean' ? item.ellipsis : true,
         align: item.align || 'center',
         fixed: item.fixed || (['action', 'operation', 'handle', 'handle_box'].includes(item.dataIndex) ? 'right' : ['rowIndex'].includes(item.key) ? 'left' : undefined)
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "1.0.5-alpha.7",
+  "version": "1.0.5-alpha.8",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",