linkmore-design 1.0.41 → 1.0.42

package/lib/CkFilter/complexFilter/drawer.js

@@ -37,6 +37,8 @@ var _context = require("../context");
 
 var _utils = require("../utils");
 
+var _saveModal = _interopRequireDefault(require("./saveModal"));
+
 var _excluded = ["item"],
     _excluded2 = ["item"];
 
@@ -90,6 +92,8 @@ var ListItemChecked = function ListItemChecked(props) {
     var checkedValue = value.value;
 
     if (Array.isArray(checkedValue)) {
+      var _getItem$data;
+
       if (getItem.type === 'nested') {
         return checkedValue;
       }
@@ -100,7 +104,7 @@ var ListItemChecked = function ListItemChecked(props) {
         return arr;
       }
 
-      return getItem.data.filter(function (v) {
+      return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
         return checkedValue.includes(v.value);
       });
     }
@@ -168,7 +172,7 @@ var ListItemChecked = function ListItemChecked(props) {
       className: "site-tag-plus",
       onClick: handleAdd
     }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-plus-circle"
+      type: "lmweb-plus"
     }), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
         key: v.value,
@@ -201,7 +205,9 @@ var ListItemChecked = function ListItemChecked(props) {
 }; // 全部筛选项
 
 
-var ListGroup = function ListGroup() {
+var ListGroup = function ListGroup(_ref) {
+  var checkedValues = _ref.checkedValues;
+
   var _useStore2 = (0, _context.useStore)(),
       state = _useStore2.state,
       dispatch = _useStore2.dispatch;
@@ -220,8 +226,8 @@ var ListGroup = function ListGroup() {
   }; // 编辑
 
 
-  var handleEdit = function handleEdit(_ref) {
-    var field = _ref.field;
+  var handleEdit = function handleEdit(_ref2) {
+    var field = _ref2.field;
     // 单项匹配数据, 根据字段名查找
     var getItem = fullData.find(function (v) {
       return v.field === field;
@@ -239,6 +245,14 @@ var ListGroup = function ListGroup() {
     });
   };
 
+  (0, _react.useEffect)(function () {
+    var nValue = fullData.filter(function (item) {
+      return !checkedValues.some(function (v) {
+        return v.field === item.field;
+      });
+    });
+    setOptions(nValue);
+  }, [checkedValues]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "list_group"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -253,9 +267,9 @@ var ListGroup = function ListGroup() {
   })), /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
     options: options,
     className: "filter_drawer_group_list"
-  }, function (_ref2) {
-    var item = _ref2.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+  }, function (_ref3) {
+    var item = _ref3.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement("div", {
@@ -307,8 +321,6 @@ var Index = function Index() {
     });
   };
 
-  var onSave = function onSave() {};
-
   var onSearch = function onSearch() {
     console.log('complexDrawer:', data);
     dispatch({
@@ -350,10 +362,9 @@ var Index = function Index() {
     extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onClose,
       size: "small"
-    }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-      onClick: onSave,
-      size: "small"
-    }, "\u4FDD\u5B58\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_saveModal.default, {
+      state: state
+    }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onSearch,
       size: "small"
@@ -366,13 +377,15 @@ var Index = function Index() {
   }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
     options: filterItemData,
     className: "filter_drawer_group_list"
-  }, function (_ref3) {
-    var item = _ref3.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
+  }, function (_ref4) {
+    var item = _ref4.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItemChecked, item));
-  })), /*#__PURE__*/_react.default.createElement(ListGroup, null)), /*#__PURE__*/_react.default.createElement(_modal.default, null)));
+  })), /*#__PURE__*/_react.default.createElement(ListGroup, {
+    checkedValues: filterItemData
+  })), /*#__PURE__*/_react.default.createElement(_modal.default, null)));
 };
 
 var _default = Index;

package/lib/CkFilter/complexFilter/saveModal.js

@@ -0,0 +1,140 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var Save = function Save(_ref) {
+  var state = _ref.state;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _Form$useForm = _linkmoreDesign.Form.useForm(),
+      _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
+  var onClose = function onClose() {
+    setVisible(false);
+    form.resetFields();
+  };
+
+  var onSave = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var val, nValue;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return form.validateFields();
+
+            case 3:
+              val = _context.sent;
+              nValue = (0, _objectSpread2.default)({
+                filterValues: (0, _objectSpread2.default)({}, state.complexDrawer.data)
+              }, val);
+
+              if (!nValue.value) {
+                Object.assign(nValue, {
+                  value: "diy".concat(Date.now())
+                });
+              }
+
+              console.log('保存数据！', nValue);
+              onClose();
+              _context.next = 13;
+              break;
+
+            case 10:
+              _context.prev = 10;
+              _context.t0 = _context["catch"](0);
+              console.log('error:', _context.t0);
+
+            case 13:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[0, 10]]);
+    }));
+
+    return function onSave() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  var modalProps = {
+    title: "保存查询",
+    size: 'small',
+    visible: visible,
+    onOk: function onOk() {
+      return onSave();
+    },
+    onCancel: function onCancel() {
+      return onClose();
+    }
+  };
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    onClick: function onClick() {
+      return setVisible(true);
+    },
+    size: "small"
+  }, "\u4FDD\u5B58\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Modal, modalProps, /*#__PURE__*/_react.default.createElement("div", {
+    className: "save_modal"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
+    form: form,
+    layout: "vertical",
+    size: "default"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_drawer_group"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "text_tip"
+  }, "\u4FDD\u5B58\u67E5\u8BE2\u540E\uFF0C\u4E0B\u6B21\u53EF\u4EE5\u5728\u81EA\u5B9A\u4E49\u67E5\u8BE2\u91CC\u5FEB\u901F\u627E\u5230\uFF0C\u8FDB\u884C\u5FEB\u6377\u67E5\u8BE2")), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_drawer_group"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
+    name: "label",
+    label: "\u540D\u79F0",
+    rules: [{
+      required: true,
+      message: '请输入名称'
+    }]
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, {
+    placeholder: "\u8BF7\u8F93\u5165",
+    size: "middle"
+  }))), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_drawer_group"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
+    name: "default",
+    label: "\u8BBE\u4E3A\u9ED8\u8BA4"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
+    size: "small"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
+    value: true
+  }, "\u662F"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
+    value: false
+  }, "\u5426"))))))));
+};
+
+var _default = Save;
+exports.default = _default;

package/lib/CkFilter/customFilter/drawer.js

@@ -176,7 +176,7 @@ var ListItem = function ListItem(props) {
       className: "site-tag-plus",
       onClick: handleAdd
     }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-plus-circle"
+      type: "lmweb-plus"
     }), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
         key: v.value,
@@ -376,7 +376,7 @@ var Index = function Index() {
     type: "dashed",
     onClick: addEvent,
     icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-plus-circle"
+      type: "lmweb-plus"
     }),
     size: "middle"
   }, "\u65B0\u589E\u7B5B\u9009\u9879")), /*#__PURE__*/_react.default.createElement(_VirtualList.default, {

package/lib/CkFilter/style/style.css

@@ -515,6 +515,7 @@ html {
   align-items: center;
   justify-content: space-between;
   height: 32px;
+  line-height: 1;
   min-width: 100px;
   border: 1px solid var(--box-shadow-color);
   border-radius: 2px;
@@ -829,9 +830,6 @@ html {
   cursor: pointer;
   transition: 0.3s;
 }
-.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box:hover {
-  border-color: var(--primary-color);
-}
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header {
   display: flex;
   align-items: center;
@@ -1039,6 +1037,39 @@ html {
 .ant-modal .custom_modal .ant-select {
   font-size: 12px;
 }
+.ant-modal .filter_drawer_group {
+  font-size: 12px;
+  line-height: 1;
+}
+.ant-modal .filter_drawer_group .text_tip {
+  font-size: 12px;
+  line-height: 22px;
+  color: var(--text-color);
+  margin-bottom: 16px;
+}
+.ant-modal .filter_drawer_group .ant-form-item {
+  margin-bottom: 16px;
+}
+.ant-modal .filter_drawer_group .ant-form-item-label {
+  padding-bottom: 0;
+}
+.ant-modal .filter_drawer_group .ant-form-item-label label {
+  font-size: 12px;
+}
+.ant-modal .filter_drawer_group .ant-form-item-control {
+  width: 100%;
+}
+.ant-modal .filter_drawer_group input {
+  font-size: 12px;
+}
+.ant-modal .filter_drawer_group .ant-radio-wrapper {
+  display: inline-flex;
+  align-items: center;
+  font-size: 12px;
+}
+.ant-modal .filter_drawer_group .ant-radio-wrapper .ant-radio {
+  top: 0;
+}
 .lm_filter_dropdown_picker .filter_picker_box {
   display: flex;
 }

package/lib/CustomTableOption/style/index.css

@@ -544,6 +544,13 @@ html {
   padding: 0 16px;
   font-size: 12px;
   margin-bottom: 8px;
+  cursor: pointer;
+}
+.lm_custom_option_columns .lm_custom_item:hover {
+  background-color: var(--line-color);
+}
+.lm_custom_option_columns .lm_custom_item:hover .hover_show {
+  display: inline-flex;
 }
 .lm_custom_option_columns .lm_custom_item .lm-checkbox > span {
   font-size: 12px;
@@ -557,6 +564,7 @@ html {
   color: var(--tip-text-color);
 }
 .lm_custom_option_columns .lm_custom_icon.hover_show {
+  display: none;
   color: var(--primary-color);
 }
 .lm_custom_size_warp {

package/lib/LmTable/ImgList/imgCell.js

@@ -33,12 +33,12 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _linkmoreDesign = require("linkmore-design");
 
-var _context = _interopRequireDefault(require("./context"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _EnlargeImg = _interopRequireDefault(require("../../EnlargeImg"));
 
+var _context = _interopRequireDefault(require("./context"));
+
 var Paragraph = _typography.default.Paragraph;
 
 var stateRender = function stateRender(v) {
@@ -82,7 +82,8 @@ var Cell = function Cell(props) {
       desc = _useContext.desc,
       footer = _useContext.footer,
       _onDoubleClick = _useContext.onDoubleClick,
-      expand = _useContext.expand;
+      expand = _useContext.expand,
+      rowSelectChange = _useContext.rowSelectChange;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -113,15 +114,21 @@ var Cell = function Cell(props) {
     }, config);
   }, []); // 多选事件
 
-  var onChange = function onChange(e) {
-    var bol = e.target.checked;
-    var nValue = bol ? [].concat((0, _toConsumableArray2.default)(defaultValue), [item]) : defaultValue.filter(function (v) {
-      return v[rowKey] !== item[rowKey];
-    });
-    dispatch({
-      type: 'changeList',
-      checkList: nValue
-    });
+  var _onChange = function onChange(e) {
+    var selectKey = e[rowKey];
+
+    if (![undefined, null].includes(selectKey)) {
+      var nValue = defaultValue.find(function (item) {
+        return item[rowKey] === selectKey;
+      }) ? defaultValue.filter(function (v) {
+        return v[rowKey] !== item[rowKey];
+      }) : [].concat((0, _toConsumableArray2.default)(defaultValue), [item]);
+      dispatch({
+        type: 'changeList',
+        checkList: nValue
+      });
+      rowSelectChange === null || rowSelectChange === void 0 ? void 0 : rowSelectChange(nValue);
+    }
   };
 
   (0, _react.useEffect)(function () {
@@ -145,7 +152,9 @@ var Cell = function Cell(props) {
   }, defaultConfig.checkbox && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     className: "checkBox",
     checked: useCheck,
-    onChange: onChange
+    onChange: function onChange(e) {
+      return _onChange(item);
+    }
   }), expand && /*#__PURE__*/_react.default.createElement("div", {
     className: "more"
   }, /*#__PURE__*/_react.default.createElement(_dropdown.default, {

package/lib/LmTable/ImgList/imgTable.js

@@ -73,8 +73,10 @@ var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
       state = _useReducer2[0],
-      dispatch = _useReducer2[1]; // 将节点方法给外部使用
+      dispatch = _useReducer2[1];
 
+  var selectedRows = rowSelection.selectedRows,
+      rowSelectChange = rowSelection.onChange; // 将节点方法给外部使用
 
   _react.default.useImperativeHandle(ref, function () {
     return {
@@ -82,21 +84,37 @@ var ImgTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return state.checkList;
       },
       clearSelect: function clearSelect() {
-        return dispatch({
+        dispatch({
           type: 'changeList',
           checkList: []
         });
+        rowSelectChange === null || rowSelectChange === void 0 ? void 0 : rowSelectChange(data);
+      },
+      customSetCheckboxRecords: function customSetCheckboxRecords(data) {
+        dispatch({
+          type: 'changeList',
+          checkList: data || []
+        });
+        rowSelectChange === null || rowSelectChange === void 0 ? void 0 : rowSelectChange(data);
       }
     };
   });
 
-  (0, _react.useEffect)(function () {}, []);
+  (0, _react.useEffect)(function () {
+    if (selectedRows) {
+      dispatch({
+        type: 'changeList',
+        checkList: selectedRows || []
+      });
+    }
+  }, [selectedRows]);
   return /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
     value: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       dispatch: dispatch
     }, resetProps), {}, {
       defaultValue: state.checkList,
-      defaultPage: defaultPage
+      defaultPage: defaultPage,
+      rowSelectChange: rowSelectChange
     })
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_pro_component_img_table",

package/lib/LmTable/Table.js

@@ -39,7 +39,7 @@ var _empty = _interopRequireDefault(require("./assets/empty.png"));
 
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
-var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "customCheck", "rowSelection", "columnsState", "onChange", "tableRowType", "size"],
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "customCheck", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size"],
     _excluded2 = ["className", "style"];
 var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
@@ -79,6 +79,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       rowSelection = props.rowSelection,
       columnsState = props.columnsState,
       onChange = props.onChange,
+      filterChange = props.filterChange,
       _props$tableRowType = props.tableRowType,
       tableRowType = _props$tableRowType === void 0 ? 'default' : _props$tableRowType,
       _props$size = props.size,
@@ -183,7 +184,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
     });
-    console.log(sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result, sortOpen, 111);
     return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
   }, [useColumns, sortOpen]);
   (0, _react.useEffect)(function () {
@@ -387,10 +387,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
     var resultColumns = useColumns.map(function (item) {
       var obj = (0, _objectSpread2.default)({}, item);
-
-      if (filters[obj.dataIndex]) {
-        obj['filteredValue'] = filters[obj.dataIndex];
-      }
+      obj['filteredValue'] = filters[obj.dataIndex] || []; // if (filters[obj.dataIndex]) {
+      //   obj['filteredValue'] = filters[obj.dataIndex]
+      // }
 
       if ((sorter === null || sorter === void 0 ? void 0 : sorter.field) === obj.dataIndex) {
         obj['sortOrder'] = sorter.order;
@@ -398,7 +397,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
       return obj;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(resultColumns, pagination, filters, sorter, extra);
+    setColumns(resultColumns);
+    filterChange === null || filterChange === void 0 ? void 0 : filterChange(resultColumns);
+    onChange === null || onChange === void 0 ? void 0 : onChange(pagination, filters, sorter, extra);
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/package.json

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