linkmore-design 1.0.41 → 1.0.44

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/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)
 
@@ -62,7 +68,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
   var _useState5 = (0, _react.useState)({
     filter: [],
     columns: [],
-    size: 'small'
+    size: 'middle'
   }),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       lmOptions = _useState6[0],
@@ -76,7 +82,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     setLmOptions({
       filter: props.filter,
       columns: props.columns,
-      size: props.size || 'small'
+      size: props.size || 'middle'
     });
   }, [props.filter, props.columns, props.size]);
   /** 提交按钮 */
@@ -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/CustomTableOption/style/index.css

@@ -514,11 +514,11 @@ html {
 }
 .lm_custom_option_columns .global_setting {
   height: 44px;
-  background-color: var(--color-4);
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 16px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid var(--border-color);
   font-size: 12px;
   margin-bottom: 8px;
 }
@@ -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/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";
 }