linkmore-design 1.0.3 → 1.0.6

package/lib/Checkbox/style/style.css

@@ -0,0 +1,119 @@
+.lm-checkbox {
+  font-size: 12px;
+  line-height: 20px;
+  color: var(--font-color);
+}
+.lm-checkbox > span:last-child {
+  padding: 0;
+  margin: 0 8px;
+  max-width: 96px;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.lm-checkbox .ant-checkbox .ant-checkbox-inner {
+  border-color: var(--stroke-color);
+}
+.lm-checkbox .ant-checkbox:hover .ant-checkbox-inner {
+  border-color: var(--primary-color);
+}
+.lm-checkbox .ant-checkbox.ant-checkbox-checked:not(.ant-checkbox-disabled) .ant-checkbox-inner {
+  background-color: var(--primary-color);
+}
+.lm-checkbox .ant-checkbox.ant-checkbox-indeterminate .ant-checkbox-inner:after {
+  background-color: var(--primary-color);
+}
+.lm-checkbox .ant-checkbox-disabled .ant-checkbox-inner {
+  background-color: var(--background-color);
+  border-color: var(--stroke-color) !important;
+}
+.lm-checkbox .ant-checkbox-disabled + span {
+  color: var(--disabled-font-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper {
+  font-size: 12px;
+  line-height: 20px;
+  height: 24px;
+  padding: 1px 8px;
+  color: var(--font-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper > span:last-child {
+  display: inline-block;
+  font-size: 12px;
+  line-height: 20px;
+  max-width: 96px;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper-checked:not([class*=' ant-checkbox-button-wrapper-disabled']) .ant-checkbox-button-wrapper:first-child {
+  border-right-color: var(--primary-hover-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper-checked:not(.ant-checkbox-button-wrapper-disabled) {
+  color: var(--primary-color);
+  border-color: var(--primary-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper-checked:not(.ant-checkbox-button-wrapper-disabled):first-child {
+  border-color: var(--primary-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper-checked:not(.ant-checkbox-button-wrapper-disabled):hover {
+  color: var(--primary-hover-color);
+  border-color: var(--primary-hover-color);
+}
+.lm-checkbox-group .ant-checkbox-wrapper {
+  font-size: 12px;
+  line-height: 20px;
+  color: var(--font-color);
+}
+.lm-checkbox-group .ant-checkbox-wrapper > span:last-child {
+  padding: 0;
+  margin: 0 8px;
+  max-width: 96px;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox .ant-checkbox-inner {
+  border-color: var(--stroke-color);
+}
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox:hover .ant-checkbox-inner {
+  border-color: var(--primary-color);
+}
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox.ant-checkbox-checked:not(.ant-checkbox-disabled) .ant-checkbox-inner {
+  background-color: var(--primary-color);
+}
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox.ant-checkbox-indeterminate .ant-checkbox-inner:after {
+  background-color: var(--primary-color);
+}
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox-disabled .ant-checkbox-inner {
+  background-color: var(--background-color);
+  border-color: var(--stroke-color) !important;
+}
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox-disabled + span {
+  color: var(--disabled-font-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper-disabled {
+  color: var(--disabled-font-color);
+  background-color: var(--disabled-bg-color);
+  border-color: var(--stroke-color);
+}
+.lm-checkbox-group .ant-checkbox-button-wrapper-disabled.ant-checkbox-button-wrapper-checked {
+  color: #b8b8b8 !important;
+  background-color: var(--background-color-hover);
+  border-color: var(--stroke-color);
+}
+.lm-checkbox-group-column {
+  display: flex;
+  flex-direction: column;
+}
+.lm-checkbox-group-column .lm-checkbox {
+  margin-left: 0;
+  margin-bottom: 12px;
+}
+.lm-checkbox-group-column .lm-checkbox > span:last-child {
+  max-width: 100%;
+  overflow: initial;
+  white-space: nowrap;
+  padding: 0;
+  margin: 0 8px;
+}
+.lm-checkbox-group-column .lm-checkbox:last-child {
+  margin-bottom: 0;
+}

package/lib/CkFilter/baseFilter/filterMenu.js

@@ -1,18 +1,14 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-require("antd/es/dropdown/style");
-
-var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -21,6 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../../IconFont"));
@@ -37,6 +35,8 @@ var FilterMenu = function FilterMenu(props) {
       title = props.title,
       _props$type = props.type,
       type = _props$type === void 0 ? 'checkbox' : _props$type,
+      _props$dateType = props.dateType,
+      dateType = _props$dateType === void 0 ? 'date' : _props$dateType,
       data = props.data,
       comProps = props.props;
 
@@ -55,20 +55,42 @@ var FilterMenu = function FilterMenu(props) {
   }, [state.filterValues]); // 判断是否正在过滤
 
   var isFiltering = (0, _react.useMemo)(function () {
-    return (0, _utils.getIsHas)(filterValue);
+    return (0, _utils.getIsHas)(filterValue) || (0, _utils.getIsHas)(state.nestedFilterValues[field]);
   }, [filterValue]); // 设置过滤的内容 filterType: 'single' 存在时 单个勾选时触发, 默认按钮触发
 
   var setFilterValue = (0, _react.useCallback)(function (val, filterType) {
-    var _state$instance$onCha, _state$instance;
+    var _state$instance$onCha, _state$instance2;
+
+    // 嵌套结构时触发
+    if (filterType === 'children') {
+      var _state$instance$onNes, _state$instance;
+
+      (_state$instance$onNes = (_state$instance = state.instance).onNested) === null || _state$instance$onNes === void 0 ? void 0 : _state$instance$onNes.call(_state$instance, val);
+      setVisible(false);
+      return;
+    }
+
+    var nValue = (0, _objectSpread2.default)({}, state.filterValues); // 嵌套结构单选时删除嵌套数据
+
+    if (type === 'nested') {
+      data.forEach(function (element) {
+        delete nValue[element.value];
+      });
+      var resetValue = (0, _objectSpread2.default)({}, state.nestedFilterValues);
+      delete resetValue[field];
+      dispatch({
+        type: 'changeNestedFilterValues',
+        nestedFilterValues: resetValue
+      });
+    }
 
-    var nValue = (0, _objectSpread2.default)({}, state.filterValues);
     (0, _utils.getIsHas)(val) ? nValue[field] = val : delete nValue[field];
     dispatch({
       type: 'changeFilterValues',
       filterValues: nValue
     }); // 触发外部查询, 单击时不关闭菜单
 
-    (_state$instance$onCha = (_state$instance = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance, nValue, state.customFilterValues);
+    (_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, nValue, state.customFilterValues);
     !filterType && setVisible(false);
   }, [dispatch, field, state.filterValues, state.instance]); // 展示的内容
 
@@ -76,17 +98,23 @@ var FilterMenu = function FilterMenu(props) {
     if (type === 'date') {
       var obj = {
         props: comProps,
+        dateType: dateType,
         getFilterValue: filterValue,
         setFilterValue: setFilterValue
       };
       return /*#__PURE__*/_react.default.createElement(_filterTypes.default, (0, _extends2.default)({
         type: "datePicker"
       }, obj));
+    } // 是否存在嵌套结构
+
+
+    if ((0, _utils.getIsHas)(state.nestedFilterValues[field])) {
+      return state.nestedFilterValues[field].label;
     }
 
     if (!isFiltering) return '全部'; // select & checkbox
 
-    if (['select', 'checkbox'].includes(type)) {
+    if (['select', 'checkbox', 'nested'].includes(type)) {
       var findItem = data.find(function (v) {
         return Array.isArray(filterValue) ? filterValue.includes(v.value) : filterValue === v.value;
       });
@@ -110,7 +138,7 @@ var FilterMenu = function FilterMenu(props) {
     }
 
     return filterValue;
-  }, [comProps, data, isFiltering, setFilterValue, type, filterValue]); // 下拉组件渲染
+  }, [comProps, data, isFiltering, setFilterValue, type, filterValue, state.nestedFilterValues, field]); // 下拉组件渲染
 
   var FilterControl = (0, _react.useCallback)(function () {
     var obj = {
@@ -147,7 +175,7 @@ var FilterMenu = function FilterMenu(props) {
     }, checkedValue))));
   }
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dropdown.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {
     trigger: ['click'],
     visible: visible,
     placement: "bottomLeft",

package/lib/CkFilter/baseFilter/index.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,22 +11,20 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-require("antd/es/input/style");
-
-var _input = _interopRequireDefault(require("antd/es/input"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _context = require("../context");
 
+var _utils = require("../utils");
+
 var _filterMenu = _interopRequireDefault(require("./filterMenu"));
 
 var _moreFilters = _interopRequireDefault(require("./moreFilters"));
 
-var _utils = require("../utils");
-
 /* 二级筛选：基础过滤
  * data
  *
@@ -70,7 +68,7 @@ var Filter = function Filter() {
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_search"
-  }, /*#__PURE__*/_react.default.createElement(_input.default.Search, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
     ref: inputRef,
     allowClear: true,
     size: "small",

package/lib/CkFilter/baseFilter/moreFilters.js

@@ -1,18 +1,14 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-require("antd/es/dropdown/style");
-
-var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -25,6 +21,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../../IconFont"));
@@ -166,7 +164,7 @@ var MoreFilters = function MoreFilters() {
       }, obj));
     });
   }, [setFilterValue, state.instance.data, state.orderFields, state.visibleFields]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_dropdown.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {
     trigger: ['click'],
     visible: visible,
     placement: "bottomLeft",

package/lib/CkFilter/complexFilter/drawer.js

@@ -1,34 +1,18 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-require("antd/es/drawer/style");
-
-var _drawer = _interopRequireDefault(require("antd/es/drawer"));
-
-require("antd/es/space/style");
-
-var _space = _interopRequireDefault(require("antd/es/space"));
-
-require("antd/es/button/style");
-
-var _button = _interopRequireDefault(require("antd/es/button"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-require("antd/es/input/style");
-
-var _input = _interopRequireDefault(require("antd/es/input"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 require("antd/es/tag/style");
@@ -39,6 +23,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../../IconFont"));
@@ -213,7 +199,7 @@ var ListGroup = function ListGroup() {
     className: "list_group_title"
   }, "\u9009\u62E9\u67E5\u8BE2\u9879"), /*#__PURE__*/_react.default.createElement("div", {
     className: "list_group_search"
-  }, /*#__PURE__*/_react.default.createElement(_input.default.Search, {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
     allowClear: true,
     size: "default",
     placeholder: "\u8BF7\u8F93\u5165",
@@ -247,7 +233,8 @@ var Index = function Index() {
       state = _useStore3.state,
       dispatch = _useStore3.dispatch;
 
-  var _state$complexDrawer = state.complexDrawer,
+  var instance = state.instance,
+      _state$complexDrawer = state.complexDrawer,
       visible = _state$complexDrawer.visible,
       data = _state$complexDrawer.data,
       complexFilterValues = state.complexFilterValues;
@@ -305,19 +292,19 @@ var Index = function Index() {
     placement: 'right',
     destroyOnClose: true,
     className: 'lm_filter_drawer',
-    extra: /*#__PURE__*/_react.default.createElement(_space.default, null, /*#__PURE__*/_react.default.createElement(_button.default, {
+    extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onClose,
       size: "small"
-    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onSave,
       size: "small"
-    }, "\u4FDD\u5B58\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u4FDD\u5B58\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onSearch,
       size: "small"
     }, "\u67E5\u8BE2"))
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_drawer.default, config, /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
     className: "complex_filter_body"
   }, isHas && /*#__PURE__*/_react.default.createElement("div", {
     className: "checked_group"

package/lib/CkFilter/complexFilter/index.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -21,10 +21,10 @@ var _IconFont = _interopRequireDefault(require("../../IconFont"));
 
 var _context = require("../context");
 
-var _drawer = _interopRequireDefault(require("./drawer"));
-
 var _utils = require("../utils");
 
+var _drawer = _interopRequireDefault(require("./drawer"));
+
 var Custom = function Custom() {
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,