venus-design 0.7.2 → 0.7.3

package/dist/VenusTable/handleVenusTableFunctions.js

@@ -8,7 +8,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
 import { dataToEnum, IconFont, storage, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE } from "./..";
-import { VENUS_ConflictFlag_Image_Url } from "./staticAttr";
+import { VENUS_ConflictFlag_Image_Url, VENUS_TABLE_ONCELL_TYPE } from "./staticAttr";
 
 /**
  * 处理显示列
@@ -40,6 +40,7 @@ export var handleColumnFns = function handleColumnFns(columnList, showIndexColum
       //@ts-ignore
       var handleEnumType = VENUS_TABLE_COLUMNENUM_TYPE[columnList[i].formUnitType] || function () {};
       var handleRenderType = VENUS_TABLE_COLUMNRENDER_TYPE[columnList[i].parameterSource.render] || function () {};
+      var handleCellType = VENUS_TABLE_ONCELL_TYPE[columnList[i].parameterSource.onCell] || function () {};
       var radioRender = getRenderColumn(columnList[i]);
       columns.push(_objectSpread(_objectSpread({
         title: columnList[i].fieldName,
@@ -76,6 +77,7 @@ export var handleColumnFns = function handleColumnFns(columnList, showIndexColum
         render: columnList[i].fieldId == "conflictFlag" ? function (text, record) {
           return handleConflictFlag(columnList[i], record, actions);
         } : columnList[i].parameterSource.render != undefined ? handleRenderType(columnList[i], actions) : radioRender,
+        onCell: columnList[i].parameterSource.onCell ? handleCellType(columnList[i], actions) : undefined,
         //@ts-ignore
         filteredValue: filters[columnList[i].fieldId]
       }, getColumnSearch(columnList[i])));

package/dist/VenusTable/staticAttr.d.ts

@@ -7,6 +7,10 @@ export declare const VENUS_TABLE_COLUMNFILTER_TYPE: any;
  * 表格列的类型（用于列筛选）
  */
 export declare const VENUS_TABLE_COLUMNENUM_TYPE: any;
+/**
+ * 行/列合并
+ */
+export declare const VENUS_TABLE_ONCELL_TYPE: any;
 /**
  * 表格列的格式化
  */
@@ -17,6 +21,12 @@ export declare const VENUS_TABLE_COLUMNRENDER_TYPE: any;
  * @param renderFn 具体的渲染函数
  */
 export declare const addRenderFunction: (name: string, renderFn: (column: VenusColumns, actions: any) => (text: any, record: any) => any) => void;
+/**
+ * 定义一个方法，用于动态添加行/列合并函数
+ * @param name render名称
+ * @param renderFn 具体的合并渲染函数
+ */
+export declare const addCellRenderFunction: (name: string, renderFn: (column: VenusColumns, actions: any) => (record: any, rowIndex: number) => any) => void;
 export declare const VENUS_ConflictFlag_Image_Url: {
     "planAdjust.png": string;
     "annex.png": string;

package/dist/VenusTable/staticAttr.js

@@ -69,6 +69,32 @@ export var VENUS_TABLE_COLUMNENUM_TYPE = {
   }
 };
 
+/**
+ * 行/列合并
+ */
+export var VENUS_TABLE_ONCELL_TYPE = {
+  "demo": function demo(column, actions) {
+    return function (record, index) {
+      if (index === 3) {
+        return {
+          rowSpan: 2
+        };
+      }
+      // These two are merged into above cell
+      if (index === 4) {
+        return {
+          rowSpan: 0
+        };
+      }
+      if (index === 1) {
+        return {
+          colSpan: 0
+        };
+      }
+      return {};
+    };
+  }
+};
 /**
  * 表格列的格式化
  */
@@ -374,6 +400,15 @@ export var addRenderFunction = function addRenderFunction(name, renderFn) {
   VENUS_TABLE_COLUMNRENDER_TYPE[name] = renderFn;
 };
 
+/**
+ * 定义一个方法，用于动态添加行/列合并函数
+ * @param name render名称
+ * @param renderFn 具体的合并渲染函数
+ */
+export var addCellRenderFunction = function addCellRenderFunction(name, renderFn) {
+  VENUS_TABLE_ONCELL_TYPE[name] = renderFn;
+};
+
 //警告标识提示框弹出位置
 export var VENUS_ConflictFlag_Image_Url = {
   "planAdjust.png": "icon-edit",

package/dist/index.d.ts

@@ -42,7 +42,7 @@ export { default as SelectUDRBySecLevelId } from './SelectCompoments/SelectUserO
 export { default as VenusTable } from './VenusTable';
 export { handleColumnFns, handleColumnFilterFns, getMenuId, handleDataIndex, getColumnSearch, getRenderColumn, assemblyFilterData, handleConflictFlag } from './VenusTable/handleVenusTableFunctions';
 export { default as VenusTableType, VenusColumns, VenusSelectDataVo, VenusEnumType } from './VenusTable/interface';
-export { VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE, addRenderFunction } from './VenusTable/staticAttr';
+export { VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE, addRenderFunction, addCellRenderFunction } from './VenusTable/staticAttr';
 export { default as Descriptions } from './Descriptions';
 export { default as VenusDetail } from './VenusDetail';
 export { handleDetail, handleDetailItems } from './VenusDetail/handleVenusDetailFunctions';

package/dist/index.js

@@ -42,7 +42,7 @@ export { default as SelectUDRBySecLevelId } from "./SelectCompoments/SelectUserO
 export { default as VenusTable } from "./VenusTable";
 export { handleColumnFns, handleColumnFilterFns, getMenuId, handleDataIndex, getColumnSearch, getRenderColumn, assemblyFilterData, handleConflictFlag } from "./VenusTable/handleVenusTableFunctions";
 export { default as VenusTableType, VenusColumns, VenusSelectDataVo, VenusEnumType } from "./VenusTable/interface";
-export { VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE, addRenderFunction } from "./VenusTable/staticAttr";
+export { VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE, addRenderFunction, addCellRenderFunction } from "./VenusTable/staticAttr";
 export { default as Descriptions } from "./Descriptions";
 export { default as VenusDetail } from "./VenusDetail";
 export { handleDetail, handleDetailItems } from "./VenusDetail/handleVenusDetailFunctions";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venus-design",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",