linkmore-design 1.0.35 → 1.0.36

package/lib/CustomTableOption/filterSort.js

@@ -26,6 +26,7 @@ var _utilities = require("@dnd-kit/utilities");
 var _lodash = require("lodash");
 
 var UNLLVALUE = [null, undefined];
+var Search = _linkmoreDesign.Input.Search;
 
 var SortItem = function SortItem(props) {
   var _a, _b;
@@ -75,6 +76,18 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       colStateValue = _useState4[0],
       setColStateValue = _useState4[1];
+  /** 正在输入的查询条件 */
+
+
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      searchIngValue = _useState6[0],
+      setSearchIngValue = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(''),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
 
   var sortMenu = (0, _react.useMemo)(function () {
     var cloneCol = (0, _lodash.cloneDeep)(localFilter);
@@ -85,8 +98,12 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       item.order = order !== undefined && order !== null ? order : UNLLVALUE.includes(item.order) ? index : item.order;
       item.show = ((_b = filterStateValue[item.field]) === null || _b === void 0 ? void 0 : _b.show) === false ? false : UNLLVALUE.includes(item.show) ? true : !!item.show;
     });
-    return cloneCol;
-  }, [localFilter, colStateValue]);
+    return cloneCol.filter(function (item) {
+      var _a;
+
+      return ((_a = item.title) === null || _a === void 0 ? void 0 : _a.indexOf(searchValue)) > -1;
+    });
+  }, [localFilter, colStateValue, searchValue]);
   var isCheckAll = (0, _react.useMemo)(function () {
     var showLength = localFilter.filter(function (item) {
       return item.show !== false;
@@ -96,6 +113,12 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       checkAll: showLength.length === localFilter.length
     };
   }, [localFilter]);
+  /** 将当前输入的值，进行最后赋值，作自动计算使用 */
+
+  var handleSearch = function handleSearch() {
+    setSearchValue(searchIngValue);
+  };
+
   (0, _react.useEffect)(function () {
     console.log(localFilter, 'localFilter');
   }, [localFilter]);
@@ -120,7 +143,6 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
         var newIndex = items.findIndex(function (s) {
           return s.field === over.id;
         });
-        console.log((0, _sortable.arrayMove)(items, oldIndex, newIndex), 77);
         return (0, _sortable.arrayMove)(items, oldIndex, newIndex).map(function (item, index) {
           return Object.assign(Object.assign({}, item), {
             order: index
@@ -182,6 +204,14 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'lm_custom_option_columns'
   }, /*#__PURE__*/_react.default.createElement("div", {
+    className: 'global_search'
+  }, /*#__PURE__*/_react.default.createElement(Search, {
+    value: searchIngValue,
+    onChange: function onChange(e) {
+      return setSearchIngValue(e.target.value);
+    },
+    onSearch: handleSearch
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: 'global_setting'
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: isCheckAll.indeterminate,

package/lib/CustomTableOption/index.js

@@ -51,15 +51,22 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
+  /** 是否记住页面使用状态 */
 
-  var _useState3 = (0, _react.useState)({
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      saveSetting = _useState4[0],
+      setSaveSetting = _useState4[1];
+
+  var _useState5 = (0, _react.useState)({
     filter: [],
     columns: [],
     size: 'small'
   }),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      lmOptions = _useState4[0],
-      setLmOptions = _useState4[1];
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      lmOptions = _useState6[0],
+      setLmOptions = _useState6[1];
 
   var openSetting = function openSetting() {
     setVisible(true);
@@ -71,7 +78,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       columns: props.columns,
       size: props.size || 'small'
     });
-  }, []);
+  }, [props.filter, props.columns, props.size]);
   /** 提交按钮 */
 
   var onOk = function onOk() {
@@ -91,7 +98,8 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       ColStateValue: ColStateValue,
       filterData: filterData,
       filterStateValue: filterStateValue,
-      size: lmOptions.size
+      size: lmOptions.size,
+      saveSetting: saveSetting
     });
     setVisible(false);
   };
@@ -146,7 +154,6 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
         size: e.target.value
       }));
     },
-    direction: 'row',
     className: 'lm_size_radio_group',
     value: lmOptions.size
   }, optionsWithDisabled.map(function (item) {
@@ -154,10 +161,20 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       className: 'lm_custom_size_warp',
       key: item.value
     }, /*#__PURE__*/_react.default.createElement("img", {
+      onClick: function onClick() {
+        return setLmOptions(Object.assign(Object.assign({}, lmOptions), {
+          size: item.value
+        }));
+      },
       src: item.imgUrl
     }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
       value: item.value
     }, item.label));
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: 'save_setting'
+  }, /*#__PURE__*/_react.default.createElement("span", null, "\u662F\u5426\u8BB0\u4F4F\u9875\u9762\u4F7F\u7528\u72B6\u6001"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, {
+    checked: saveSetting,
+    onChange: setSaveSetting
   }))))));
 });
 var _default = LMCustomTableOption;

package/lib/CustomTableOption/style/index.css

@@ -503,6 +503,15 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+.lm_custom-table-option.lm_drawer .ant-drawer-body {
+  padding: 0 0 24px 0;
+}
+.lm_custom-table-option.lm_drawer .ant-drawer-body .ant-tabs-nav-wrap {
+  padding: 0 24px;
+}
+.lm_custom-table-option.lm_drawer .ant-drawer-body .ant-tabs-content-holder {
+  padding: 0 24px;
+}
 .lm_custom_option_columns .global_setting {
   height: 44px;
   background-color: var(--color-4);
@@ -516,6 +525,10 @@ html {
 .lm_custom_option_columns .global_setting .lm-checkbox > span {
   font-size: 12px;
 }
+.lm_custom_option_columns .global_setting > span {
+  color: var(--primary-color);
+  cursor: pointer;
+}
 .lm_custom_option_columns .fixed_title {
   color: var(--color-45);
   font-size: 12px;
@@ -549,6 +562,9 @@ html {
 .lm_custom_size_warp {
   display: flex;
   flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
 }
 .lm_custom_size_warp > img {
   width: 100px;
@@ -562,3 +578,16 @@ html {
   align-items: center;
   justify-content: space-between;
 }
+.save_setting {
+  height: 68px;
+  margin-top: 24px;
+  border-top: 1px solid var(--color-6);
+  border-bottom: 1px solid var(--color-6);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+}
+.global_search {
+  margin-bottom: 16px;
+}

package/lib/EditTable/EditTable.js

@@ -211,6 +211,16 @@ var EditableRow = function EditableRow(_ref3) {
     value: form
   }, /*#__PURE__*/_react.default.createElement("tr", props)));
 };
+
+var isValidValue = function isValidValue(verifyValue) {
+  var toStringValue = JSON.stringify(verifyValue);
+
+  if (verifyValue === undefined || verifyValue === null || verifyValue === '' || toStringValue === '[]' || toStringValue === '{}') {
+    return false;
+  }
+
+  return true;
+};
 /*
   表格单元格
   editEnum： 下拉框时的数据数组（非数组时是配置设置）
@@ -243,6 +253,8 @@ var EditableCell = function EditableCell(props) {
       setEditing = _useState2[1];
 
   var focusCapturedRef = (0, _react.useRef)(false);
+  var curValue = (0, _lodash.get)(record, dataIndex);
+  var curValueIsValid = isValidValue(curValue);
 
   var getDefaultChildNode = function getDefaultChildNode() {
     var focusCaptured = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -260,8 +272,18 @@ var EditableCell = function EditableCell(props) {
       }
     }
 
-    if (focusCaptured) {
-      if (isHoverEdit && editable) {
+    if (isHoverEdit && editable) {
+      if (focusCaptured) {
+        childNode = /*#__PURE__*/_react.default.createElement(_form.default.Item, (0, _extends2.default)({
+          style: {
+            margin: 0
+          }
+        }, itemProps, {
+          name: dataIndex
+        }), Control(editable));
+      }
+
+      if (!curValueIsValid) {
         childNode = /*#__PURE__*/_react.default.createElement(_form.default.Item, (0, _extends2.default)({
           style: {
             margin: 0
@@ -474,7 +496,7 @@ var EditableCell = function EditableCell(props) {
   var isOpenEdit = isEdit && focusCapturedRef.current || isHoverEdit && focusCapturedRef.current;
   var classNames = (0, _classnames.default)({
     'lm_base_editTable_cell': true,
-    'lm_base_editTable_cell_edit': isOpenEdit
+    'lm_base_editTable_cell_edit': isOpenEdit || isHoverEdit && !curValueIsValid
   });
   var extensionConfig = {};
 

package/lib/Input/index.d.ts

@@ -0,0 +1,11 @@
+import { Input } from 'antd';
+import type { InputProps, InputRef } from 'antd';
+import React from 'react';
+interface ILmInput extends React.ForwardRefExoticComponent<InputProps & React.RefAttributes<InputRef>> {
+    Group: typeof Input.Group;
+    Search: typeof Input.Search;
+    TextArea: typeof Input.TextArea;
+    Password: typeof Input.Password;
+}
+declare const LmInput: ILmInput;
+export default LmInput;

package/lib/Input/index.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,22 +13,29 @@ require("antd/es/input/style");
 
 var _input = _interopRequireDefault(require("antd/es/input"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../IconFont"));
 
-var _excluded = ["allowClear"],
-    _excluded2 = ["allowClear"],
-    _excluded3 = ["allowClear"];
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
 var LmInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$allowClear = props.allowClear,
       allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  return /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+      rest = __rest(props, ["allowClear"]);
+
+  return /*#__PURE__*/_react.default.createElement(_input.default, Object.assign({
     ref: ref,
     className: "lm_input"
   }, rest, {
@@ -39,8 +46,9 @@ LmInput.Group = _input.default.Group;
 LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$allowClear2 = props.allowClear,
       allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
-  return /*#__PURE__*/_react.default.createElement(_input.default.Search, (0, _extends2.default)({
+      rest = __rest(props, ["allowClear"]);
+
+  return /*#__PURE__*/_react.default.createElement(_input.default.Search, Object.assign({
     enterButton: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
       type: "lmweb-search"
     })
@@ -55,8 +63,9 @@ LmInput.TextArea = _input.default.TextArea;
 LmInput.Password = function (props) {
   var _props$allowClear3 = props.allowClear,
       allowClear = _props$allowClear3 === void 0 ? true : _props$allowClear3,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded3);
-  return /*#__PURE__*/_react.default.createElement(_input.default.Password, (0, _extends2.default)({
+      rest = __rest(props, ["allowClear"]);
+
+  return /*#__PURE__*/_react.default.createElement(_input.default.Password, Object.assign({
     className: "lm_input_password",
     iconRender: function iconRender(visible) {
       return visible ? /*#__PURE__*/_react.default.createElement(_IconFont.default, {

package/lib/LmTable/Table.js

@@ -291,7 +291,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           selectedRows: value
         });
         rowClick === null || rowClick === void 0 ? void 0 : rowClick(value);
-      }
+      },
+      checkboxRecords: useSelectedRows.selectedRows
     };
   }); // loading触发清空选中状态
 
@@ -337,6 +338,18 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$autoSizer = props.autoSizer,
       autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
 
+  var _useState9 = (0, _react.useState)({
+    width: '100%',
+    height: '100%'
+  }),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      tableSize = _useState10[0],
+      setTableSize = _useState10[1];
+
+  var defaultRef = ref || (0, _react.useRef)(null);
+  var tableWarpRef = (0, _react.useRef)(null);
+  var resizeRef = (0, _react.useRef)(null);
+
   if (!autoSizer) {
     return /*#__PURE__*/_react.default.createElement("div", {
       ref: tableWarpRef,
@@ -355,17 +368,6 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     })));
   }
 
-  var _useState9 = (0, _react.useState)({
-    width: '100%',
-    height: '100%'
-  }),
-      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      tableSize = _useState10[0],
-      setTableSize = _useState10[1];
-
-  var defaultRef = ref || (0, _react.useRef)(null);
-  var tableWarpRef = (0, _react.useRef)(null);
-  var resizeRef = (0, _react.useRef)(null);
   var resetHeight = (0, _react.useMemo)(function () {
     var height = tableSize.height;
     var h = height - 32;

package/lib/Radio/index.js

@@ -20,7 +20,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
 
 var _excluded = ["children"],
-    _excluded2 = ["children", "size", "buttonStyle", "direction"];
+    _excluded2 = ["children", "size", "buttonStyle", "direction", "className"];
 
 var LMRadio = function LMRadio(props) {
   var children = props.children,
@@ -37,10 +37,11 @@ LMRadio.Group = function (props) {
       buttonStyle = props.buttonStyle,
       _props$direction = props.direction,
       direction = _props$direction === void 0 ? 'row' : _props$direction,
+      className = props.className,
       restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
   console.log(children, 'rrr');
   return /*#__PURE__*/_react.default.createElement(_radio.default.Group, (0, _extends2.default)({
-    className: (0, _classnames.default)('lm-radio-group', "lm-radio-group-".concat(direction)),
+    className: (0, _classnames.default)(className, 'lm-radio-group', "lm-radio-group-".concat(direction)),
     size: size
   }, restProps), children);
 };

package/lib/Radio/style/style.css

@@ -119,6 +119,10 @@
 .lm-radio-group .ant-radio-button-wrapper-disabled:hover {
   color: var(--disabled-font-color);
 }
+.lm-radio-group.lm-radio-group-row {
+  display: flex;
+  flex-direction: row;
+}
 .lm-radio-group.lm-radio-group-column {
   display: flex;
   flex-direction: column;

package/package.json

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