linkmore-design 1.0.45 → 1.0.46

package/es/CkFilter/components/filterTypes.js

@@ -124,6 +124,13 @@ var SelectFilter = function SelectFilter(_ref2) {
     setFilterValue(item.value);
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current2;
+
+      (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
@@ -192,6 +199,13 @@ var NestedFilter = function NestedFilter(_ref4) {
     }
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current3;
+
+      (_inputRef$current3 = inputRef.current) === null || _inputRef$current3 === void 0 ? void 0 : _inputRef$current3.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
@@ -369,6 +383,13 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
     !isSearch && setFilterValue(arr, 'single');
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current4;
+
+      (_inputRef$current4 = inputRef.current) === null || _inputRef$current4 === void 0 ? void 0 : _inputRef$current4.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
@@ -489,6 +510,13 @@ var MoreFilter = function MoreFilter(_ref12) {
     setFilterValue(checkedValues, 'cancel');
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current5;
+
+      (_inputRef$current5 = inputRef.current) === null || _inputRef$current5 === void 0 ? void 0 : _inputRef$current5.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -688,9 +716,9 @@ var CascaderFilter = function CascaderFilter(props) {
 
     (0, _react.useEffect)(function () {
       visible && setTimeout(function () {
-        var _inputRef$current2;
+        var _inputRef$current6;
 
-        (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+        (_inputRef$current6 = inputRef.current) === null || _inputRef$current6 === void 0 ? void 0 : _inputRef$current6.focus();
       }, 200);
     }, [visible]);
     return /*#__PURE__*/_react.default.createElement("div", {

package/es/CustomTableOption/index.js

@@ -15,15 +15,15 @@ var MiddleImg = require('./assets/option3.png');
 
 var TabPane = Tabs.TabPane;
 var optionsWithDisabled = [{
-  label: '紧凑型',
-  value: 'small',
-  imgUrl: SmallImg
-}, {
   label: '默认',
   value: 'default',
   imgUrl: DefaultImg
 }, {
-  label: '中等',
+  label: '紧凑型',
+  value: 'small',
+  imgUrl: SmallImg
+}, {
+  label: '宽松',
   value: 'middle',
   imgUrl: MiddleImg
 }];
@@ -50,7 +50,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState5 = useState({
     filter: [],
     columns: [],
-    size: 'middle'
+    size: 'default'
   }),
       _useState6 = _slicedToArray(_useState5, 2),
       lmOptions = _useState6[0],
@@ -64,7 +64,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
     setLmOptions({
       filter: props.filter,
       columns: props.columns,
-      size: props.size || 'middle'
+      size: props.size || 'default'
     });
   }, [props.filter, props.columns, props.size]);
   /** 提交按钮 */

package/es/LmTable/Table.js

@@ -282,15 +282,20 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       tableAlertRender: false,
       checkConfig: checkConfig,
       // components: vComponents,
-      scroll: resetProps.autoSizer || resetProps.scroll ? (0, _objectSpread2.default)({
+      scroll: resetProps.autoSizer || resetProps.scroll ? Object.assign((0, _objectSpread2.default)({
         y: autoSize.height
-      }, resetProps.scroll) : null,
+      }, resetProps.scroll), resizeable ? {
+        x: '100%'
+      } : {}) : resizeable ? {
+        x: '100%'
+      } : null,
       pagination: !hiddenPage && (0, _objectSpread2.default)({
         showSizeChanger: true,
         showQuickJumper: true,
         showTotal: function showTotal(total) {
           return "\u5171 ".concat(total, " \u6761");
-        }
+        },
+        size: 'small'
       }, pagination),
       rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
         fixed: true,
@@ -322,7 +327,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columns: resetColumns(),
       size: size
     }, resetProps);
-  }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height]);
+  }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height, resizeable]);
   var resultColumns = (0, _react.useMemo)(function () {
     var result = useColumns.map(function (item, index) {
       var _columnsStateMap$item, _columnsStateMap$item2, _columnsStateMap$item3, _columnsStateMap$item4;
@@ -368,7 +373,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       //   obj[item.dataIndex || item.key] = { ...(obj[item.dataIndex || item.key] || {}), fixed: item.fixed }
       // }
     });
-    console.log(obj, 'oobjb');
     setColumnsStateMap(obj);
   }, [columnsState]); // useEffect(() => {
   //   console.log(props.columnsStateValue, 'v vv')
@@ -569,15 +573,15 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [tableSize, props]);
 
   var changeSize = function changeSize() {
-    var _tableWarpRef$current4;
+    var _tableWarpRef$current;
 
     var value = props.summary ? 48 : 0;
 
-    var _tableWarpRef$current = (_tableWarpRef$current4 = tableWarpRef.current) === null || _tableWarpRef$current4 === void 0 ? void 0 : _tableWarpRef$current4.getBoundingClientRect(),
-        _tableWarpRef$current2 = _tableWarpRef$current.width,
-        width = _tableWarpRef$current2 === void 0 ? '100%' : _tableWarpRef$current2,
-        _tableWarpRef$current3 = _tableWarpRef$current.height,
-        height = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3;
+    var _ref4 = ((_tableWarpRef$current = tableWarpRef.current) === null || _tableWarpRef$current === void 0 ? void 0 : _tableWarpRef$current.getBoundingClientRect()) || {},
+        _ref4$width = _ref4.width,
+        width = _ref4$width === void 0 ? '100%' : _ref4$width,
+        _ref4$height = _ref4.height,
+        height = _ref4$height === void 0 ? '100%' : _ref4$height;
 
     setTableSize({
       width: width,
@@ -591,13 +595,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         customCheck = props.customCheck,
         summary = props.summary;
     setTimeout(function () {
-      var _tableWarpRef$current8;
+      var _tableWarpRef$current5;
 
-      var _tableWarpRef$current5 = (_tableWarpRef$current8 = tableWarpRef.current) === null || _tableWarpRef$current8 === void 0 ? void 0 : _tableWarpRef$current8.getBoundingClientRect(),
-          _tableWarpRef$current6 = _tableWarpRef$current5.width,
-          width = _tableWarpRef$current6 === void 0 ? '100%' : _tableWarpRef$current6,
-          _tableWarpRef$current7 = _tableWarpRef$current5.height,
-          height = _tableWarpRef$current7 === void 0 ? '100%' : _tableWarpRef$current7;
+      var _tableWarpRef$current2 = (_tableWarpRef$current5 = tableWarpRef.current) === null || _tableWarpRef$current5 === void 0 ? void 0 : _tableWarpRef$current5.getBoundingClientRect(),
+          _tableWarpRef$current3 = _tableWarpRef$current2.width,
+          width = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3,
+          _tableWarpRef$current4 = _tableWarpRef$current2.height,
+          height = _tableWarpRef$current4 === void 0 ? '100%' : _tableWarpRef$current4;
 
       var value = summary ? 48 : 0;
       setTableSize({

package/es/LmTable/style/style.css

@@ -830,9 +830,6 @@ html {
 #lm_protable_warp .lm_protable .ant-table {
   font-size: 12px;
 }
-#lm_protable_warp .lm_protable.lm_resizeable table {
-  table-layout: inherit !important;
-}
 #lm_protable_warp .lm_protable .ant-card-body,
 #lm_protable_warp .lm_protable .ant-pro-card-body {
   padding: 0;

package/lib/CkFilter/components/filterTypes.js

@@ -124,6 +124,13 @@ var SelectFilter = function SelectFilter(_ref2) {
     setFilterValue(item.value);
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current2;
+
+      (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
@@ -192,6 +199,13 @@ var NestedFilter = function NestedFilter(_ref4) {
     }
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current3;
+
+      (_inputRef$current3 = inputRef.current) === null || _inputRef$current3 === void 0 ? void 0 : _inputRef$current3.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
@@ -369,6 +383,13 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
     !isSearch && setFilterValue(arr, 'single');
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current4;
+
+      (_inputRef$current4 = inputRef.current) === null || _inputRef$current4 === void 0 ? void 0 : _inputRef$current4.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, isSearch && /*#__PURE__*/_react.default.createElement("div", {
@@ -489,6 +510,13 @@ var MoreFilter = function MoreFilter(_ref12) {
     setFilterValue(checkedValues, 'cancel');
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current5;
+
+      (_inputRef$current5 = inputRef.current) === null || _inputRef$current5 === void 0 ? void 0 : _inputRef$current5.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -688,9 +716,9 @@ var CascaderFilter = function CascaderFilter(props) {
 
     (0, _react.useEffect)(function () {
       visible && setTimeout(function () {
-        var _inputRef$current2;
+        var _inputRef$current6;
 
-        (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+        (_inputRef$current6 = inputRef.current) === null || _inputRef$current6 === void 0 ? void 0 : _inputRef$current6.focus();
       }, 200);
     }, [visible]);
     return /*#__PURE__*/_react.default.createElement("div", {

package/lib/CustomTableOption/index.js

@@ -33,15 +33,15 @@ var MiddleImg = require('./assets/option3.png');
 
 var TabPane = _linkmoreDesign.Tabs.TabPane;
 var optionsWithDisabled = [{
-  label: '紧凑型',
-  value: 'small',
-  imgUrl: SmallImg
-}, {
   label: '默认',
   value: 'default',
   imgUrl: DefaultImg
 }, {
-  label: '中等',
+  label: '紧凑型',
+  value: 'small',
+  imgUrl: SmallImg
+}, {
+  label: '宽松',
   value: 'middle',
   imgUrl: MiddleImg
 }];
@@ -68,7 +68,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
   var _useState5 = (0, _react.useState)({
     filter: [],
     columns: [],
-    size: 'middle'
+    size: 'default'
   }),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       lmOptions = _useState6[0],
@@ -82,7 +82,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     setLmOptions({
       filter: props.filter,
       columns: props.columns,
-      size: props.size || 'middle'
+      size: props.size || 'default'
     });
   }, [props.filter, props.columns, props.size]);
   /** 提交按钮 */

package/lib/LmTable/Table.js

@@ -282,15 +282,20 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       tableAlertRender: false,
       checkConfig: checkConfig,
       // components: vComponents,
-      scroll: resetProps.autoSizer || resetProps.scroll ? (0, _objectSpread2.default)({
+      scroll: resetProps.autoSizer || resetProps.scroll ? Object.assign((0, _objectSpread2.default)({
         y: autoSize.height
-      }, resetProps.scroll) : null,
+      }, resetProps.scroll), resizeable ? {
+        x: '100%'
+      } : {}) : resizeable ? {
+        x: '100%'
+      } : null,
       pagination: !hiddenPage && (0, _objectSpread2.default)({
         showSizeChanger: true,
         showQuickJumper: true,
         showTotal: function showTotal(total) {
           return "\u5171 ".concat(total, " \u6761");
-        }
+        },
+        size: 'small'
       }, pagination),
       rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
         fixed: true,
@@ -322,7 +327,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       columns: resetColumns(),
       size: size
     }, resetProps);
-  }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height]);
+  }, [useColumns, useSelectedRows, columnsStateMap, resetProps, autoSize.height, resizeable]);
   var resultColumns = (0, _react.useMemo)(function () {
     var result = useColumns.map(function (item, index) {
       var _columnsStateMap$item, _columnsStateMap$item2, _columnsStateMap$item3, _columnsStateMap$item4;
@@ -368,7 +373,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       //   obj[item.dataIndex || item.key] = { ...(obj[item.dataIndex || item.key] || {}), fixed: item.fixed }
       // }
     });
-    console.log(obj, 'oobjb');
     setColumnsStateMap(obj);
   }, [columnsState]); // useEffect(() => {
   //   console.log(props.columnsStateValue, 'v vv')
@@ -569,15 +573,15 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [tableSize, props]);
 
   var changeSize = function changeSize() {
-    var _tableWarpRef$current4;
+    var _tableWarpRef$current;
 
     var value = props.summary ? 48 : 0;
 
-    var _tableWarpRef$current = (_tableWarpRef$current4 = tableWarpRef.current) === null || _tableWarpRef$current4 === void 0 ? void 0 : _tableWarpRef$current4.getBoundingClientRect(),
-        _tableWarpRef$current2 = _tableWarpRef$current.width,
-        width = _tableWarpRef$current2 === void 0 ? '100%' : _tableWarpRef$current2,
-        _tableWarpRef$current3 = _tableWarpRef$current.height,
-        height = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3;
+    var _ref4 = ((_tableWarpRef$current = tableWarpRef.current) === null || _tableWarpRef$current === void 0 ? void 0 : _tableWarpRef$current.getBoundingClientRect()) || {},
+        _ref4$width = _ref4.width,
+        width = _ref4$width === void 0 ? '100%' : _ref4$width,
+        _ref4$height = _ref4.height,
+        height = _ref4$height === void 0 ? '100%' : _ref4$height;
 
     setTableSize({
       width: width,
@@ -591,13 +595,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         customCheck = props.customCheck,
         summary = props.summary;
     setTimeout(function () {
-      var _tableWarpRef$current8;
+      var _tableWarpRef$current5;
 
-      var _tableWarpRef$current5 = (_tableWarpRef$current8 = tableWarpRef.current) === null || _tableWarpRef$current8 === void 0 ? void 0 : _tableWarpRef$current8.getBoundingClientRect(),
-          _tableWarpRef$current6 = _tableWarpRef$current5.width,
-          width = _tableWarpRef$current6 === void 0 ? '100%' : _tableWarpRef$current6,
-          _tableWarpRef$current7 = _tableWarpRef$current5.height,
-          height = _tableWarpRef$current7 === void 0 ? '100%' : _tableWarpRef$current7;
+      var _tableWarpRef$current2 = (_tableWarpRef$current5 = tableWarpRef.current) === null || _tableWarpRef$current5 === void 0 ? void 0 : _tableWarpRef$current5.getBoundingClientRect(),
+          _tableWarpRef$current3 = _tableWarpRef$current2.width,
+          width = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3,
+          _tableWarpRef$current4 = _tableWarpRef$current2.height,
+          height = _tableWarpRef$current4 === void 0 ? '100%' : _tableWarpRef$current4;
 
       var value = summary ? 48 : 0;
       setTableSize({

package/lib/LmTable/style/style.css

@@ -830,9 +830,6 @@ html {
 #lm_protable_warp .lm_protable .ant-table {
   font-size: 12px;
 }
-#lm_protable_warp .lm_protable.lm_resizeable table {
-  table-layout: inherit !important;
-}
 #lm_protable_warp .lm_protable .ant-card-body,
 #lm_protable_warp .lm_protable .ant-pro-card-body {
   padding: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"