linkmore-design 1.0.30 → 1.0.33

package/lib/LmTable/Table.js

@@ -27,7 +27,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
-var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "customCheck"];
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "customCheck", "rowSelection", "columnsState", "tableRowType"];
 var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
 var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
@@ -44,8 +44,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$virtual = props.virtual,
       virtual = _props$virtual === void 0 ? false : _props$virtual,
       customCheck = props.customCheck,
+      rowSelection = props.rowSelection,
+      columnsState = props.columnsState,
+      _props$tableRowType = props.tableRowType,
+      tableRowType = _props$tableRowType === void 0 ? 'default' : _props$tableRowType,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  console.log(virtual, '--virtual', autoSize);
   var _resetProps$rowKey = resetProps.rowKey,
       rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
 
@@ -89,7 +92,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var resetColumns = (0, _react.useCallback)(function () {
-    return useColumns.map(function (col, index) {
+    return useColumns.filter(function (item) {
+      return item.show !== false;
+    }).map(function (col, index) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
         width: col.width,
         onHeaderCell: function onHeaderCell(column) {
@@ -112,20 +117,25 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         trigger = _Object$assign.trigger,
         highlight = _Object$assign.highlight;
 
+    console.log(trigger, highlight, 'rowclick');
+
     if (highlight) {
       setActiveKey(record[rowKey]);
     }
 
     if (trigger === 'row') {
       var selectedRows = useSelectedRows.selectedRows;
-      var selectedRowKeys = selectedRows.map(function (v) {
-        return v[rowKey];
-      });
-      var Idx = selectedRowKeys.indexOf(record[rowKey]);
-      Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
-      setSelectedRows({
-        selectedRows: selectedRows
-      });
+
+      if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
+        var selectedRowKeys = selectedRows.map(function (v) {
+          return v[rowKey];
+        });
+        var Idx = selectedRowKeys.indexOf(record[rowKey]);
+        Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
+        setSelectedRows({
+          selectedRows: selectedRows
+        });
+      }
     }
 
     rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -139,6 +149,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var config = (0, _react.useMemo)(function () {
+    console.log(resetProps, 'resetPropsresetProps');
     return (0, _objectSpread2.default)({
       defaultSize: 'small',
       tableLayout: 'fixed',
@@ -154,6 +165,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columnsState: {
         value: columnsStateMap,
         onChange: function onChange(k) {
+          console.log(k, 'kkk');
           setColumnsStateMap(k);
         }
       },
@@ -161,9 +173,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       tableAlertRender: false,
       checkConfig: checkConfig,
       // components: vComponents,
-      scroll: (0, _objectSpread2.default)({
+      scroll: resetProps.autoSizer || resetProps.scroll ? (0, _objectSpread2.default)({
         y: autoSize.height
-      }, props.scroll),
+      }, resetProps.scroll) : null,
       pagination: !hiddenPage && (0, _objectSpread2.default)({
         showSizeChanger: true,
         showQuickJumper: true,
@@ -171,7 +183,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           return "\u5171 ".concat(total, " \u6761");
         }
       }, pagination),
-      rowSelection: {
+      rowSelection: rowSelection === false ? null : (0, _objectSpread2.default)({
         fixed: true,
         type: 'checkbox',
         columnWidth: 36,
@@ -184,7 +196,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           });
           rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
         }
-      },
+      }, rowSelection),
       onRow: function onRow(record) {
         return {
           onClick: function onClick(e) {
@@ -230,7 +242,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   // }, [columns, autoSize.width])
 
   (0, _react.useEffect)(function () {
-    var obj = {};
+    var obj = (0, _objectSpread2.default)({}, columnsState);
     columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
       if (item.fixed) {
         obj[item.dataIndex || item.key] = {
@@ -240,6 +252,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
     setColumnsStateMap(obj);
   }, []); // useEffect(() => {
+  //   console.log(props.columnsStateValue, 'v vv')
+  //   setColumnsStateMap(props.columnsStateValue)
+  // }, [props.columnsStateValue])
+  // useEffect(() => {
   //   rowClick?.()
   // }, [useSelectedRows])
   // 将节点方法给外部使用
@@ -292,6 +308,27 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 /** 1: 使用scroll.x y 来控制宽高 默认都是100% */
 
 var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _props$autoSizer = props.autoSizer,
+      autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
+
+  if (!autoSizer) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      ref: tableWarpRef,
+      id: "lm_protable_warp",
+      style: {
+        width: '100%',
+        height: '100%'
+      }
+    }, /*#__PURE__*/_react.default.createElement(ResetTable, (0, _extends2.default)({
+      ref: defaultRef
+    }, props, {
+      autoSize: {
+        height: '100%',
+        width: '100%'
+      }
+    })));
+  }
+
   var _useState9 = (0, _react.useState)({
     width: '100%',
     height: '100%'
@@ -305,11 +342,10 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var resizeRef = (0, _react.useRef)(null);
   var resetHeight = (0, _react.useMemo)(function () {
     var height = tableSize.height;
-    console.log(3);
-    var h = height - 48;
+    var h = height - 32;
 
     if (!props.hiddenPage || props.customCheck) {
-      h -= 32;
+      h -= 48;
     }
 
     if (props.columns.some(function (v) {
@@ -364,7 +400,6 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         _tableWarpRef$current7 = _tableWarpRef$current5.height,
         height = _tableWarpRef$current7 === void 0 ? '100%' : _tableWarpRef$current7;
 
-    console.log(width, height, '--tableWarpReftableWarpRef', tableWarpRef.current);
     var value = summary ? 48 : 0;
     resizeRef.current = window.addEventListener('resize', handResize);
     setTableSize({

package/lib/LmTable/style/index.js

@@ -0,0 +1,3 @@
+"use strict";
+
+require("./style.css");