linkmore-design 1.0.10 → 1.0.13

package/es/CkFilter/components/filterTypes.js

@@ -281,12 +281,12 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
       filters = _ref8$filters === void 0 ? [] : _ref8$filters,
       getFilterValue = _ref8.getFilterValue,
       setFilterValue = _ref8.setFilterValue;
-  var inputRef = (0, _react.useRef)(null);
+  var inputRef = (0, _react.useRef)(null); // 选中的数据项: ['', '', ...];
 
   var _useState5 = (0, _react.useState)(getFilterValue || []),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       checkedValues = _useState6[0],
-      setCheckedValues = _useState6[1]; // 搜索后的筛选项
+      setCheckedValues = _useState6[1]; // 搜索后的筛选项：[{value: '', ... }, ...]
 
 
   var _useState7 = (0, _react.useState)(filters),
@@ -297,20 +297,29 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
 
   var isSearch = (0, _react.useMemo)(function () {
     return filters.length > 8;
-  }, [filters.length]); // 是否半选
-
-  var indeterminate = (0, _react.useMemo)(function () {
-    return checkedValues.length && checkedValues.length < filters.length;
-  }, [checkedValues.length, filters.length]); // 是否全选
+  }, [filters.length]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
 
   var checkAll = (0, _react.useMemo)(function () {
-    return checkedValues.length === filters.length;
-  }, [checkedValues.length, filters.length]); // 全选事件
+    var isLen = checkedValues.length >= options.length;
+    return isLen && options.every(function (_ref9) {
+      var value = _ref9.value;
+      return checkedValues.includes(value);
+    });
+  }, [checkedValues.length, options]); // 是否半选: 存在选中的数据 && 未全选
+
+  var indeterminate = (0, _react.useMemo)(function () {
+    return checkedValues.length && !checkAll;
+  }, [checkedValues.length, checkAll]); // 全选事件
 
   var onCheckAllChange = function onCheckAllChange() {
-    var nValue = checkAll ? [] : filters.map(function (v) {
+    var nValue = checkAll ? checkedValues.filter(function (v) {
+      return !options.some(function (_ref10) {
+        var value = _ref10.value;
+        return v === value;
+      });
+    }) : Array.from(new Set([].concat((0, _toConsumableArray2.default)(checkedValues), (0, _toConsumableArray2.default)(options.map(function (v) {
       return v.value;
-    });
+    })))));
     setCheckedValues(nValue);
   }; // 搜索
 
@@ -329,7 +338,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
 
   var handleReset = function handleReset() {
     if (inputRef.current) {
-      inputRef.current.state.value = '';
+      inputRef.current.input.value = '';
     }
 
     setFilterValue(undefined);
@@ -376,9 +385,9 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
   }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
     options: options,
     className: "filter_list"
-  }, function (_ref9) {
-    var item = _ref9.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref9, _excluded4);
+  }, function (_ref11) {
+    var item = _ref11.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref11, _excluded4);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: (0, _classnames.default)('filter_item', {
         checked: checkedValues.includes(item.value)
@@ -395,19 +404,20 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
   }, "\u6682\u65E0\u6570\u636E")), isSearch && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "footer_save",
-    onClick: handleSure
-  }, "\u786E\u5B9A"), /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
     onClick: handleReset
-  }, "\u6E05\u7A7A")));
+  }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    type: "primary",
+    size: "small",
+    onClick: handleSure
+  }, "\u786E\u5B9A")));
 }; // 更多筛选
 
 
-var MoreFilter = function MoreFilter(_ref10) {
-  var filters = _ref10.filters,
-      getFilterValue = _ref10.getFilterValue,
-      setFilterValue = _ref10.setFilterValue;
+var MoreFilter = function MoreFilter(_ref12) {
+  var filters = _ref12.filters,
+      getFilterValue = _ref12.getFilterValue,
+      setFilterValue = _ref12.setFilterValue;
   // 选中的数据
   var checkedValues = (0, _react.useMemo)(function () {
     return getFilterValue;
@@ -473,9 +483,9 @@ var MoreFilter = function MoreFilter(_ref10) {
   }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
     options: options,
     className: "filter_list"
-  }, function (_ref11) {
-    var item = _ref11.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref11, _excluded5);
+  }, function (_ref13) {
+    var item = _ref13.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref13, _excluded5);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_item",
       onClick: function onClick(e) {
@@ -497,11 +507,11 @@ var MoreFilter = function MoreFilter(_ref10) {
 }; // 日期范围选择器
 
 
-var DatePickerFilter = function DatePickerFilter(_ref12) {
-  var getFilterValue = _ref12.getFilterValue,
-      setFilterValue = _ref12.setFilterValue,
-      props = _ref12.props,
-      dateType = _ref12.dateType;
+var DatePickerFilter = function DatePickerFilter(_ref14) {
+  var getFilterValue = _ref14.getFilterValue,
+      setFilterValue = _ref14.setFilterValue,
+      props = _ref14.props,
+      dateType = _ref14.dateType;
   console.log(dateType, '--dateType'); // 对日期格式的转换, 日期组件仅接收moment格式
 
   var value = (0, _react.useMemo)(function () {

package/es/CkFilter/filter.js

@@ -54,7 +54,7 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         filterValues = _props$filterValues === void 0 ? {} : _props$filterValues,
         hasCustom = props.custom,
         hasLevelGroup = props.levelGroup;
-    var isMore = (data === null || data === void 0 ? void 0 : data.length) > 5;
+    var isMore = (data === null || data === void 0 ? void 0 : data.length) > 3;
     var visileData = data.filter(function (v) {
       v.fixed && (0, _utils.getIsHas)(v === null || v === void 0 ? void 0 : v.value) && (filterValues[v.field] = v.value);
       return v.fixed;

package/es/CkFilter/style/style.css

@@ -71,6 +71,9 @@
   padding: var(--gap);
   line-height: 1;
 }
+.ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-weight: 500;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -727,8 +730,8 @@ html {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 14px;
-  min-height: 60px;
+  font-size: 12px;
+  min-height: 40px;
   color: #666;
   padding: 0 8px;
 }

package/es/CustomerService/style/style.css

@@ -71,6 +71,9 @@
   padding: var(--gap);
   line-height: 1;
 }
+.ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-weight: 500;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/es/Drawer/style/index.css

@@ -71,6 +71,9 @@
   padding: var(--gap);
   line-height: 1;
 }
+.ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-weight: 500;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -494,3 +497,6 @@ html {
   height: 48px;
   padding: 0 24px !important;
 }
+.lm_drawer.ant-drawer .ant-drawer-content .ant-drawer-header .ant-drawer-title {
+  font-weight: 500;
+}

package/es/Dropdown/style/index.css

@@ -71,6 +71,9 @@
   padding: var(--gap);
   line-height: 1;
 }
+.ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-weight: 500;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/es/EditTable/style/style.css

@@ -71,6 +71,9 @@
   padding: var(--gap);
   line-height: 1;
 }
+.ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-weight: 500;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/es/Filter/Popover.js

@@ -23,10 +23,10 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 
-var _react = _interopRequireWildcard(require("react"));
-
 var _icons = require("@ant-design/icons");
 
+var _react = _interopRequireWildcard(require("react"));
+
 var _components = require("./components");
 
 var _popContext = _interopRequireDefault(require("./popContext"));

package/es/Filter/style/style.css

@@ -71,6 +71,9 @@
   padding: var(--gap);
   line-height: 1;
 }
+.ant-notification-notice .ant-notification-notice-content .ant-notification-notice-message {
+  font-weight: 500;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */

package/es/IconFont/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _icons = require("@ant-design/icons");
 
 var IconFont = (0, _icons.createFromIconfontCN)({
-  scriptUrl: '//at.alicdn.com/t/font_2966019_r2sjvddyblq.js' // 在 iconfont.cn 上生成
+  scriptUrl: '//at.alicdn.com/t/font_2966019_8aij0300kjo.js' // 在 iconfont.cn 上生成
 
 });
 var _default = IconFont;