npm - @fle-ui/plus-table - Versions diffs - 1.2.2 → 1.2.4 - Mend

@fle-ui/plus-table 1.2.2 → 1.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/es/FormSearch/index.less CHANGED Viewed

@@ -3,6 +3,9 @@
   ::-webkit-scrollbar {
     width: 2px;
   }
+  // .ant-tree-checkbox-checked
+  // .ant-tree-checkbox-disabled
+  // pointer-events: none;
   .ant-pro-query-filter-row {
     row-gap: 12px;
   }
@@ -21,22 +24,21 @@
         display: flex;
         flex-direction: row;
         .ant-form-item-label {
-          width: 84px;
+          width: 86px;
           line-height: 34px;
-          margin-right: 8px;
           text-align: right;
           label {
-            font-size: 14px;
+            font-size: 12px;
           }
         }
         .ant-form-item-control {
-          width: 230px;
+          width: 240px;
           .ant-form-item-control-input {
-            width: 230px;
+            width: 240px;
           }
           .ant-picker {
-            min-width: 230px !important;
-            width: 230px;
+            min-width: 240px !important;
+            width: 240px;
           }
         }
       }

package/es/index.js CHANGED Viewed

@@ -33,7 +33,7 @@ import FormRender from './FormSearch/index';
 import { BarsOutlined } from '@ant-design/icons';
 import './FormSearch/index.less';
 var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _otherProps$scroll, _otherProps$scroll2;
+  var _otherProps$scroll;
   var mode = props.mode,
     columns = props.columns,
     _props$hasShowFull = props.hasShowFull,
@@ -111,7 +111,6 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var handleOnChangeColumn = function handleOnChangeColumn(map) {
     // 列设置更新
-    debugger;
     setColumnsStateMap(map);
   };
   var handleSave = /*#__PURE__*/function () {
@@ -179,13 +178,13 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
             return (_props$fetchSetting2 = props.fetchSetting) === null || _props$fetchSetting2 === void 0 ? void 0 : _props$fetchSetting2.call(props);
           case 3:
             res = _context4.sent;
-            // debugger;
             // show?: boolean;
             // fixed?: 'right' | 'left' | undefined;
             // order?: number;
             // disable?: boolean | {
             //     checkbox: boolean;
             // };
+            // console.log(res);
             setColumnsStateContainId(res);
             setColumnsStateMap(res);
           case 6:
@@ -200,7 +199,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
   }();
   var onValuesChange = function onValuesChange(changeValue, allValue) {
     var _searchRef$current2;
-    searchRef === null || searchRef === void 0 ? void 0 : (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.setFieldValue(drawFormRef.current.getFieldsValue());
+    searchRef === null || searchRef === void 0 ? void 0 : (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.setFieldsValue(drawFormRef.current.getFieldsValue());
   };
   var onTableChange = function onTableChange(pagination) {
     // 劫持分页改动
@@ -280,15 +279,14 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   return /*#__PURE__*/React.createElement("div", {
-    className: !searchDrawer ? 'page_plustable__body' : 'page_plustable__body turn-left'
+    className: "page_plustable__body"
   }, /*#__PURE__*/React.createElement(ProTable, _extends({}, otherProps, {
     // 公共配置 大家都有的
     pagination: pagination,
     actionRef: actionRef,
     formRef: searchRef,
     scroll: {
-      y: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.y) || document.documentElement.clientHeight - 355,
-      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll2 = otherProps.scroll) === null || _otherProps$scroll2 === void 0 ? void 0 : _otherProps$scroll2.x) || 1300
+      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.x) || 1300
     }
     // 根据用户自定义的配置 如果配置了高级筛选就有这个配置
     ,
@@ -310,13 +308,14 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
       },
       optionRender: function optionRender(searchConfig) {
         return [/*#__PURE__*/React.createElement(_Button, {
+          key: "1",
           size: "middle",
           type: "primary",
-          ghost: true,
           onClick: function onClick() {
             handleSearchAll(searchConfig);
           }
         }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(_Button, {
+          key: "2",
           type: "default",
           onClick: function onClick() {
             var _drawFormRef$current3;
@@ -325,9 +324,10 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
             actionRef.current.reload();
           },
           size: "middle"
-        }, "\u91CD\u7F6E"),, columns.filter(function (item) {
+        }, "\u91CD\u7F6E"), columns.filter(function (item) {
           return item.search !== false;
         }).length > 3 ? /*#__PURE__*/React.createElement("a", {
+          key: "3",
           onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
             var _drawFormRef$current4, _searchRef$current4;
             return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -358,7 +358,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
       if (item.baseSearch) {
         return _objectSpread(_objectSpread({}, item), {}, {
           search: item.search,
-          fieldProps: {
+          fieldProps: _objectSpread({
             onChange: function onChange(e) {
               if (e) {
                 var _drawFormRef$current5;
@@ -368,7 +368,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
                 drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current7 = drawFormRef.current) === null || _drawFormRef$current7 === void 0 ? void 0 : _drawFormRef$current7.resetFields([item.dataIndex]);
               }
             }
-          }
+          }, item.fieldProps)
         });
       }
       return _objectSpread(_objectSpread({}, item), {}, {
@@ -390,6 +390,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     options: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? _objectSpread({
       setting: {
         checkedReset: false,
+        // children: <div></div>,
         extra: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
             return handleSave();
@@ -410,7 +411,7 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     width: 380,
     rootStyle: {
       position: 'fixed',
-      top: props.top || 0
+      top: props.top || 92
     },
     getContainer: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.getContainer) || document.getElementsByTagName('body')[0],
     className: "search-drawer",
@@ -435,8 +436,34 @@ var PlusTable = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     form: {},
     search: {
-      optionRender: function optionRender() {
-        return [];
+      optionRender: function optionRender(searchConfig) {
+        return [/*#__PURE__*/React.createElement("div", {
+          style: {
+            position: 'fixed',
+            bottom: 0,
+            display: 'flex',
+            width: '380px',
+            right: '0',
+            justifyContent: 'space-around',
+            padding: '16px',
+            boxSizing: 'border-box'
+          }
+        }, /*#__PURE__*/React.createElement(_Button, {
+          size: "middle",
+          type: "primary",
+          onClick: function onClick() {
+            handleSearchAll(searchConfig);
+          }
+        }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(_Button, {
+          type: "default",
+          onClick: function onClick() {
+            var _drawFormRef$current8;
+            drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current8 = drawFormRef.current) === null || _drawFormRef$current8 === void 0 ? void 0 : _drawFormRef$current8.resetFields();
+            actionRef.current.reset();
+            actionRef.current.reload();
+          },
+          size: "middle"
+        }, "\u91CD\u7F6E"))];
       },
       collapsed: false,
       collapseRender: function collapseRender() {

package/lib/FormSearch/index.less CHANGED Viewed

@@ -3,6 +3,9 @@
   ::-webkit-scrollbar {
     width: 2px;
   }
+  // .ant-tree-checkbox-checked
+  // .ant-tree-checkbox-disabled
+  // pointer-events: none;
   .ant-pro-query-filter-row {
     row-gap: 12px;
   }
@@ -21,22 +24,21 @@
         display: flex;
         flex-direction: row;
         .ant-form-item-label {
-          width: 84px;
+          width: 86px;
           line-height: 34px;
-          margin-right: 8px;
           text-align: right;
           label {
-            font-size: 14px;
+            font-size: 12px;
           }
         }
         .ant-form-item-control {
-          width: 230px;
+          width: 240px;
           .ant-form-item-control-input {
-            width: 230px;
+            width: 240px;
           }
           .ant-picker {
-            min-width: 230px !important;
-            width: 230px;
+            min-width: 240px !important;
+            width: 240px;
           }
         }
       }

package/lib/index.js CHANGED Viewed

@@ -33,7 +33,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _otherProps$scroll, _otherProps$scroll2;
+  var _otherProps$scroll;
   var mode = props.mode,
     columns = props.columns,
     _props$hasShowFull = props.hasShowFull,
@@ -111,7 +111,6 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   var handleOnChangeColumn = function handleOnChangeColumn(map) {
     // 列设置更新
-    debugger;
     setColumnsStateMap(map);
   };
   var handleSave = /*#__PURE__*/function () {
@@ -179,13 +178,13 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             return (_props$fetchSetting2 = props.fetchSetting) === null || _props$fetchSetting2 === void 0 ? void 0 : _props$fetchSetting2.call(props);
           case 3:
             res = _context4.sent;
-            // debugger;
             // show?: boolean;
             // fixed?: 'right' | 'left' | undefined;
             // order?: number;
             // disable?: boolean | {
             //     checkbox: boolean;
             // };
+            // console.log(res);
             setColumnsStateContainId(res);
             setColumnsStateMap(res);
           case 6:
@@ -200,7 +199,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }();
   var onValuesChange = function onValuesChange(changeValue, allValue) {
     var _searchRef$current2;
-    searchRef === null || searchRef === void 0 ? void 0 : (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.setFieldValue(drawFormRef.current.getFieldsValue());
+    searchRef === null || searchRef === void 0 ? void 0 : (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.setFieldsValue(drawFormRef.current.getFieldsValue());
   };
   var onTableChange = function onTableChange(pagination) {
     // 劫持分页改动
@@ -280,15 +279,14 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   }();
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: !searchDrawer ? 'page_plustable__body' : 'page_plustable__body turn-left'
+    className: "page_plustable__body"
   }, /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, _extends({}, otherProps, {
     // 公共配置 大家都有的
     pagination: pagination,
     actionRef: actionRef,
     formRef: searchRef,
     scroll: {
-      y: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.y) || document.documentElement.clientHeight - 355,
-      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll2 = otherProps.scroll) === null || _otherProps$scroll2 === void 0 ? void 0 : _otherProps$scroll2.x) || 1300
+      x: (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$scroll = otherProps.scroll) === null || _otherProps$scroll === void 0 ? void 0 : _otherProps$scroll.x) || 1300
     }
     // 根据用户自定义的配置 如果配置了高级筛选就有这个配置
     ,
@@ -310,13 +308,14 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       },
       optionRender: function optionRender(searchConfig) {
         return [/*#__PURE__*/_react.default.createElement(_antd.Button, {
+          key: "1",
           size: "middle",
           type: "primary",
-          ghost: true,
           onClick: function onClick() {
             handleSearchAll(searchConfig);
           }
         }, "\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          key: "2",
           type: "default",
           onClick: function onClick() {
             var _drawFormRef$current3;
@@ -325,9 +324,10 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             actionRef.current.reload();
           },
           size: "middle"
-        }, "\u91CD\u7F6E"),, columns.filter(function (item) {
+        }, "\u91CD\u7F6E"), columns.filter(function (item) {
           return item.search !== false;
         }).length > 3 ? /*#__PURE__*/_react.default.createElement("a", {
+          key: "3",
           onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
             var _drawFormRef$current4, _searchRef$current4;
             return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -358,7 +358,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       if (item.baseSearch) {
         return _objectSpread(_objectSpread({}, item), {}, {
           search: item.search,
-          fieldProps: {
+          fieldProps: _objectSpread({
             onChange: function onChange(e) {
               if (e) {
                 var _drawFormRef$current5;
@@ -368,7 +368,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
                 drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current7 = drawFormRef.current) === null || _drawFormRef$current7 === void 0 ? void 0 : _drawFormRef$current7.resetFields([item.dataIndex]);
               }
             }
-          }
+          }, item.fieldProps)
         });
       }
       return _objectSpread(_objectSpread({}, item), {}, {
@@ -390,6 +390,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     options: (action === null || action === void 0 ? void 0 : action.includes('columnSetting')) ? _objectSpread({
       setting: {
         checkedReset: false,
+        // children: <div></div>,
         extra: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("a", {
           onClick: function onClick() {
             return handleSave();
@@ -410,7 +411,7 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     width: 380,
     rootStyle: {
       position: 'fixed',
-      top: props.top || 0
+      top: props.top || 92
     },
     getContainer: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.getContainer) || document.getElementsByTagName('body')[0],
     className: "search-drawer",
@@ -435,8 +436,34 @@ var PlusTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     },
     form: {},
     search: {
-      optionRender: function optionRender() {
-        return [];
+      optionRender: function optionRender(searchConfig) {
+        return [/*#__PURE__*/_react.default.createElement("div", {
+          style: {
+            position: 'fixed',
+            bottom: 0,
+            display: 'flex',
+            width: '380px',
+            right: '0',
+            justifyContent: 'space-around',
+            padding: '16px',
+            boxSizing: 'border-box'
+          }
+        }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          size: "middle",
+          type: "primary",
+          onClick: function onClick() {
+            handleSearchAll(searchConfig);
+          }
+        }, "\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          type: "default",
+          onClick: function onClick() {
+            var _drawFormRef$current8;
+            drawFormRef === null || drawFormRef === void 0 ? void 0 : (_drawFormRef$current8 = drawFormRef.current) === null || _drawFormRef$current8 === void 0 ? void 0 : _drawFormRef$current8.resetFields();
+            actionRef.current.reset();
+            actionRef.current.reload();
+          },
+          size: "middle"
+        }, "\u91CD\u7F6E"))];
       },
       collapsed: false,
       collapseRender: function collapseRender() {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-table",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "@fle-ui/plus-table",
   "keywords": [
     "fle-ui",
@@ -46,5 +46,5 @@
     "@ant-design/pro-components": "^2.7.0",
     "dayjs": "^1.11.10"
   },
-  "gitHead": "6ee42fd7fb69ac3582da27500dcb9a5b30f70665"
+  "gitHead": "25f0a020b59e41af207bb1059c0141577f04b6eb"
 }