linkmore-design 1.0.24 → 1.0.27

package/lib/CkFilter/customFilter/drawer.js

@@ -43,7 +43,7 @@ var _context2 = require("../context");
 
 var _utils = require("../utils");
 
-var _CustomModal = _interopRequireDefault(require("../components/CustomModal"));
+var _modal = _interopRequireDefault(require("../components/modal"));
 
 var _excluded = ["item"];
 
@@ -56,23 +56,68 @@ var ListItem = function ListItem(props) {
       fullData = _state$instance$fullD === void 0 ? [] : _state$instance$fullD,
       customDrawer = state.customDrawer;
   var field = props.field,
-      value = props.value; // 单项匹配数据, 根据字段名查找
+      value = props.value; // 单项匹配数据, 根据字段名查找, 嵌套筛选时查询父级
 
   var getItem = (0, _react.useMemo)(function () {
     return fullData.find(function (v) {
-      return v.field === field;
+      return [field, value.originField].includes(v.field);
     });
-  }, [field, fullData]); // 选中的数据
+  }, [props, fullData]); // 选中值的处理
+
+  var resetValue = (0, _react.useMemo)(function () {
+    if (getItem.type === 'cascader') {
+      var _value$value;
+
+      return (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.map(function (v) {
+        return v[v.length - 1];
+      });
+    }
+
+    return value.value;
+  }, [props]); // 遍历树结构
+
+  var deepChildren = function deepChildren(arr, preArr) {
+    arr.forEach(function (item) {
+      var _item$children;
+
+      if (resetValue.includes(item.value)) {
+        preArr.push(item);
+      }
+
+      if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
+        deepChildren(item.children, preArr);
+      }
+    });
+  }; // 选中的数据
+
 
   var checkedValues = (0, _react.useMemo)(function () {
+    console.log('value', value);
     var checkedValue = value.value;
 
     if (Array.isArray(checkedValue)) {
+      if (getItem.type === 'nested') {
+        return checkedValue;
+      }
+
+      if (getItem.type === 'cascader') {
+        var arr = [];
+        deepChildren(getItem.data, arr);
+        return arr;
+      }
+
       return getItem.data.filter(function (v) {
         return checkedValue.includes(v.value);
       });
     }
 
+    if (getItem.type === 'input') {
+      return resetValue ? [{
+        value: resetValue,
+        label: resetValue
+      }] : [];
+    }
+
     var filterValue = getItem.data.find(function (v) {
       return v.value === checkedValue;
     });
@@ -87,6 +132,7 @@ var ListItem = function ListItem(props) {
       type: 'changeModal',
       customModal: {
         visible: true,
+        type: 'custom',
         data: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, getItem), value)
       }
     });
@@ -126,7 +172,12 @@ var ListItem = function ListItem(props) {
 
 
   var tagElem = function tagElem() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
+      className: "site-tag-plus",
+      onClick: handleAdd
+    }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+      type: "lmweb-plus-circle"
+    }), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
         key: v.value,
         closable: true,
@@ -134,12 +185,7 @@ var ListItem = function ListItem(props) {
           return onTagClose(v.value);
         }
       }, v.label);
-    }), /*#__PURE__*/_react.default.createElement(_tag.default, {
-      className: "site-tag-plus",
-      onClick: handleAdd
-    }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-plus-circle"
-    }), " \u65B0\u589E"));
+    }));
   }; // 模式
 
 
@@ -180,7 +226,8 @@ var Index = function Index() {
 
   var filterItem = (0, _react.useMemo)(function () {
     return customDrawer.data;
-  }, [customDrawer.data]); // 过滤的内容转数组
+  }, [customDrawer.data]);
+  console.log('customDrawer', customDrawer); // 过滤的内容转数组
 
   var filterItemData = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(filterItem === null || filterItem === void 0 ? void 0 : filterItem.filterValues) ? Object.entries(filterItem.filterValues).map(function (v) {
@@ -271,7 +318,7 @@ var Index = function Index() {
     width: 440,
     placement: 'right',
     destroyOnClose: true,
-    className: 'filter_drawer',
+    className: 'lm_filter_drawer',
     extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onClose,
       size: "small"
@@ -325,7 +372,6 @@ var Index = function Index() {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_drawer_group_add"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    type: "dashed",
     block: true,
     onClick: addEvent,
     icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
@@ -341,7 +387,7 @@ var Index = function Index() {
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItem, item));
-  }))), /*#__PURE__*/_react.default.createElement(_CustomModal.default, null)));
+  }))), /*#__PURE__*/_react.default.createElement(_modal.default, null)));
 };
 
 var _default = Index;

package/lib/CkFilter/customFilter/index.js

@@ -34,6 +34,8 @@ var Custom = function Custom() {
       state = _useStore.state,
       dispatch = _useStore.dispatch;
 
+  var size = state.instance.size;
+
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       visible = _useState2[0],
@@ -107,7 +109,8 @@ var Custom = function Custom() {
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('filter_custom', {
-      active: visible
+      active: visible,
+      small: size === 'small'
     })
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "custom_label"

package/lib/CkFilter/customFilter/radioGroup.js

@@ -24,7 +24,8 @@ var CustomGroup = function CustomGroup() {
 
   var _state$instance = state.instance,
       levelGroup = _state$instance.levelGroup,
-      levelGroupKey = _state$instance.levelGroupKey;
+      levelGroupKey = _state$instance.levelGroupKey,
+      size = _state$instance.size;
   var defaultValue = (0, _react.useMemo)(function () {
     var _levelGroup$find;
 
@@ -50,8 +51,8 @@ var CustomGroup = function CustomGroup() {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
     defaultValue: defaultValue,
     onChange: onChange,
-    size: "small"
-  }, levelGroup.map(function (v) {
+    size: size
+  }, size, levelGroup.map(function (v) {
     return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Button, {
       key: v.value,
       value: v.value

package/lib/CkFilter/style/style.css

@@ -75,6 +75,9 @@
   font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-content > div > div:last-child {
+  margin-bottom: 8px;
+}
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
@@ -508,7 +511,7 @@ html {
   display: inline-flex;
   align-items: center;
   justify-content: space-between;
-  height: 24px;
+  height: 32px;
   min-width: 100px;
   border: 1px solid var(--box-shadow-color);
   border-radius: 2px;
@@ -517,6 +520,9 @@ html {
   cursor: pointer;
   transition: 0.3s;
 }
+.lm_filter_base .filter_custom.small {
+  height: 24px;
+}
 .lm_filter_base .filter_custom .custom_label {
   padding-right: 16px;
 }
@@ -528,7 +534,7 @@ html {
 }
 .lm_filter_base .line {
   display: inline-block;
-  height: var(--basic-height);
+  height: 32px;
   border-right: 1px solid #eee;
 }
 .lm_filter_base .ant-radio-button-wrapper {
@@ -540,7 +546,7 @@ html {
 .lm_filter_base .filter_item {
   display: inline-flex;
   align-items: center;
-  height: 24px;
+  height: 32px;
   line-height: 1;
   border-radius: 1px;
   padding: 0 8px;
@@ -670,7 +676,7 @@ html {
   width: 100%;
 }
 .filter_dropdown .filter_body .virtual_list {
-  min-width: 160px;
+  min-width: 168px;
   max-height: 224px;
   overflow: auto;
 }
@@ -685,6 +691,7 @@ html {
   transition: 0.3s;
   white-space: nowrap;
   cursor: pointer;
+  gap: 8px;
 }
 .filter_dropdown .filter_body .filter_item.add_more {
   border-top: 1px solid var(--stripe-color);
@@ -739,14 +746,25 @@ html {
 }
 .filter_dropdown .filter_empty {
   display: flex;
+  flex-flow: column;
   align-items: center;
   justify-content: center;
   font-size: 12px;
   min-height: 40px;
   color: #666;
-  padding: 0 8px;
+  padding: 16px 8px;
+  margin: auto;
+  gap: 4px;
+}
+.filter_dropdown .filter_empty .filter_empty_text {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 20px;
+  color: var(--font-color);
 }
 .filter_dropdown .ant-checkbox-wrapper {
+  flex: 1;
   font-size: 12px;
   align-items: center;
 }
@@ -794,6 +812,7 @@ html {
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_add .ant-btn {
   font-size: 12px;
+  max-width: initial;
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item {
   margin-bottom: var(--gap);
@@ -815,6 +834,7 @@ html {
   justify-content: space-between;
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_title {
+  font-size: 12px;
   font-weight: 500;
 }
 .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_icon {
@@ -953,6 +973,23 @@ html {
 }
 .ant-drawer.lm_det_drawer .ant-select {
   font-size: 12px;
+  width: 100%;
+}
+.ant-drawer.lm_det_drawer .custom_form {
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+  gap: 24px;
+}
+.ant-drawer.lm_det_drawer .custom_form .custom_label {
+  font-size: 14px;
+  font-weight: 500;
+  margin-bottom: 16px;
+}
+.ant-drawer.lm_det_drawer .custom_form .custom_full {
+  display: flex;
+  flex-flow: column;
+  flex: 1;
 }
 .ant-modal .custom_modal .checkbox_tag {
   display: inline-flex;
@@ -1033,3 +1070,6 @@ html {
 .ant-select-dropdown.ant-cascader-dropdown {
   padding: 0;
 }
+.ant-select-dropdown.ant-cascader-dropdown .ant-cascader-menu-item {
+  padding: 5px 8px;
+}

package/lib/CustomerService/style/style.css

@@ -75,6 +75,9 @@
   font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-content > div > div:last-child {
+  margin-bottom: 8px;
+}
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }

package/lib/Drawer/style/index.css

@@ -75,6 +75,9 @@
   font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-content > div > div:last-child {
+  margin-bottom: 8px;
+}
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }

package/lib/Dropdown/index.d.ts

@@ -4,9 +4,11 @@ export interface IDropdownProps extends DropdownProps {
     className?: string;
     style?: React.CSSProperties;
     dropdownmatchwidth?: boolean;
+    onlyIcon?: boolean;
 }
 interface LmDropdownInterface extends React.FC<IDropdownProps> {
     Button?: typeof Dropdown.Button;
+    IconButton?: typeof Dropdown.Button;
 }
 declare const LMDropdown: LmDropdownInterface;
 export default LMDropdown;

package/lib/Dropdown/index.js

@@ -40,7 +40,9 @@ var CLMDropdown = function CLMDropdown(props) {
       overlayClassName = props.overlayClassName,
       _props$dropdownmatchw = props.dropdownmatchwidth,
       dropdownmatchwidth = _props$dropdownmatchw === void 0 ? false : _props$dropdownmatchw,
-      others = __rest(props, ["children", "className", "overlayClassName", "dropdownmatchwidth"]);
+      _props$onlyIcon = props.onlyIcon,
+      onlyIcon = _props$onlyIcon === void 0 ? false : _props$onlyIcon,
+      others = __rest(props, ["children", "className", "overlayClassName", "dropdownmatchwidth", "onlyIcon"]);
 
   var dropdownRef = (0, _react.useRef)(null);
 
@@ -50,21 +52,20 @@ var CLMDropdown = function CLMDropdown(props) {
       setMinWidth = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    var _a, _b, _c;
+    var _a, _b;
 
     if (dropdownmatchwidth) {
       var dropdown_dom = (_a = dropdownRef.current.getElementsByClassName("lm_dropdown")) === null || _a === void 0 ? void 0 : _a[0];
 
       if (dropdown_dom) {
-        console.log((_b = dropdown_dom.getBoundingClientRect()) === null || _b === void 0 ? void 0 : _b.width);
-        setMinWidth(((_c = dropdown_dom.getBoundingClientRect()) === null || _c === void 0 ? void 0 : _c.width) || '');
+        setMinWidth(((_b = dropdown_dom.getBoundingClientRect()) === null || _b === void 0 ? void 0 : _b.width) || '');
       }
     }
   }, []);
 
   if (!dropdownmatchwidth) {
     return /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
-      className: (0, _classnames.default)(className, prefixCls)
+      className: (0, _classnames.default)(className, prefixCls, onlyIcon && 'only_icon')
     }, others, {
       overlayClassName: (0, _classnames.default)(overlayClassName, 'lm_dropdown_overlay')
     }), children);
@@ -73,7 +74,7 @@ var CLMDropdown = function CLMDropdown(props) {
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: dropdownRef
   }, /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
-    className: (0, _classnames.default)(className, prefixCls)
+    className: (0, _classnames.default)(className, prefixCls, onlyIcon && 'only_icon')
   }, others, {
     overlayClassName: (0, _classnames.default)(overlayClassName, 'lm_dropdown_overlay'),
     overlayStyle: minwidth ? Object.assign({
@@ -107,9 +108,7 @@ LMDropdown.Button = function (props) {
   }, []);
 
   if (!dropdownmatchwidth) {
-    return /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({
-      size: 'small'
-    }, props, {
+    return /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({}, props, {
       overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
       className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '')
     }));
@@ -117,9 +116,7 @@ LMDropdown.Button = function (props) {
 
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: dropdownRef
-  }, /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({
-    size: 'small'
-  }, props, {
+  }, /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({}, props, {
     overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
     overlayStyle: minwidth ? Object.assign({
       minWidth: minwidth

package/lib/Dropdown/style/index.css

@@ -75,6 +75,9 @@
   font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-content > div > div:last-child {
+  margin-bottom: 8px;
+}
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
@@ -497,11 +500,19 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+.lm_dropdown.only_icon {
+  padding: 6px 8px;
+}
+.lm_dropdown_overlay > * {
+  max-height: 552px;
+  max-width: 552px;
+  overflow-y: auto;
+}
 .lm_dropdown_overlay .ant-dropdown-menu {
   padding: 0;
 }
 .lm_dropdown_overlay .ant-dropdown-menu .ant-dropdown-menu-item {
-  height: 32px;
+  min-height: 32px;
   font-size: 12px;
 }
 .lm_dropdown_overlay .ant-dropdown-menu .ant-dropdown-menu-item:hover {
@@ -519,7 +530,7 @@ html {
   box-sizing: content-box;
 }
 .lm_dropdown_button .ant-btn {
-  height: 22px;
+  height: 30px;
   border-top: 0px;
   border-bottom: 0px;
 }
@@ -528,6 +539,8 @@ html {
 }
 .lm_dropdown_button .ant-btn:first-child {
   border-left: 0px;
+  padding-left: 12px;
+  padding-right: 12px;
 }
 .lm_dropdown_button .ant-btn:last-child {
   border-right: 0px;

package/lib/EditTable/style/style.css

@@ -75,6 +75,9 @@
   font-size: 14px;
   font-weight: 500;
 }
+.ant-notification-notice .ant-notification-notice-content > div > div:last-child {
+  margin-bottom: 8px;
+}
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }

package/lib/Empty/index.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { Empty } from 'antd';
+export interface IEmptyProps {
+    className?: string;
+    style?: React.CSSProperties;
+}
+export default Empty;

package/lib/Empty/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/empty/style");
+
+var _empty = _interopRequireDefault(require("antd/es/empty"));
+
+var _default = _empty.default;
+exports.default = _default;