linkmore-design 1.0.42 → 1.0.43

package/lib/CkFilter/baseFilter/index.js

@@ -55,6 +55,13 @@ var Filter = function Filter() {
       visibleFields = state.visibleFields,
       orderFields = state.orderFields,
       customFilterValues = state.customFilterValues;
+  var hasClear = (0, _react.useMemo)(function () {
+    var _Object$keys;
+
+    var obj = (0, _objectSpread2.default)({}, filterValues);
+    delete obj[searchKey];
+    return ((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) || false;
+  }, [filterValues]);
 
   var handleFilter = function handleFilter(val) {
     var nValue = (0, _objectSpread2.default)({}, filterValues);
@@ -84,7 +91,7 @@ var Filter = function Filter() {
 
     dispatch({
       type: 'changeFilterValues',
-      filterValues: {}
+      filterValues: (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey])
     });
     onChange === null || onChange === void 0 ? void 0 : onChange((0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]), customFilterValues);
   };
@@ -105,7 +112,7 @@ var Filter = function Filter() {
     return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
       key: v.field
     }, v));
-  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  }), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
     onClick: handleClear
   }, "\u4E00\u952E\u6E05\u7A7A")), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));

package/lib/CustomTableOption/index.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
-import { TableProps } from 'antd';
+import { TableProps, TooltipProps } from 'antd';
 export interface ICustomTableOptionProps {
     className?: string;
     style?: React.CSSProperties;
     size?: 'small' | 'default' | 'middle';
+    tooltip?: TooltipProps;
     filter?: Record<string, any>[];
     columns?: TableProps<any>['columns'];
     onSave?: (data: any) => void;

package/lib/CustomTableOption/index.js

@@ -9,6 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("antd/es/tooltip/style");
+
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -43,7 +47,9 @@ var optionsWithDisabled = [{
 }];
 var prefixCls = 'lm_custom-table-option';
 var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var className = props.className;
+  var className = props.className,
+      _props$tooltip = props.tooltip,
+      tooltip = _props$tooltip === void 0 ? {} : _props$tooltip;
   var filterRef = (0, _react.useRef)(null);
   var columnsRef = (0, _react.useRef)(null); // const sizeRef = useRef(null)
 
@@ -104,12 +110,12 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     setVisible(false);
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tooltip.default, Object.assign({}, tooltip), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     onClick: openSetting,
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
       type: 'lmweb-setting'
     })
-  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, {
+  })), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, {
     className: (0, _classnames.default)(className, prefixCls),
     title: "\u7B5B\u9009\u8BBE\u7F6E",
     visible: visible,

package/lib/IconFont/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2966019 */
-  src: url('iconfont.woff2?t=1659410207517') format('woff2'),
-       url('iconfont.woff?t=1659410207517') format('woff'),
-       url('iconfont.ttf?t=1659410207517') format('truetype');
+  src: url('iconfont.woff2?t=1659434868739') format('woff2'),
+       url('iconfont.woff?t=1659434868739') format('woff'),
+       url('iconfont.ttf?t=1659434868739') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.lmweb-icon_china1:before {
+  content: "\e6c9";
+}
+
+.lmweb-icon_English1:before {
+  content: "\e6ca";
+}
+
+.lmweb-icon_fan1:before {
+  content: "\e6cb";
+}
+
+.lmweb-icon_application_light:before {
+  content: "\e6c7";
+}
+
+.lmweb-icon_application:before {
+  content: "\e6c8";
+}
+
 .lmweb-icon-m-receipt:before {
   content: "\e6c6";
 }
@@ -89,18 +109,6 @@
   content: "\e6b9";
 }
 
-.lmweb-icon_fan:before {
-  content: "\e6b3";
-}
-
-.lmweb-icon_china:before {
-  content: "\e6b1";
-}
-
-.lmweb-icon_English:before {
-  content: "\e6b2";
-}
-
 .lmweb-icon_deliver_light:before {
   content: "\e6ac";
 }