linkmore-design 1.0.33 → 1.0.34

package/es/CkFilter/baseFilter/index.js

@@ -11,6 +11,8 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 
 var _linkmoreDesign = require("linkmore-design");
@@ -37,22 +39,23 @@ var Filter = function Filter() {
   var inputRef = (0, _react.useRef)(null);
 
   var _useStore = (0, _context.useStore)(),
-      _useStore$state = _useStore.state,
-      _useStore$state$insta = _useStore$state.instance,
-      data = _useStore$state$insta.data,
-      onChange = _useStore$state$insta.onChange,
-      placeholder = _useStore$state$insta.placeholder,
-      searchKey = _useStore$state$insta.searchKey,
-      search = _useStore$state$insta.search,
-      filter = _useStore$state$insta.filter,
-      size = _useStore$state$insta.size,
-      isMore = _useStore$state.isMore,
-      filterValues = _useStore$state.filterValues,
-      visibleFields = _useStore$state.visibleFields,
-      orderFields = _useStore$state.orderFields,
-      customFilterValues = _useStore$state.customFilterValues,
+      state = _useStore.state,
       dispatch = _useStore.dispatch;
 
+  var _state$instance = state.instance,
+      data = _state$instance.data,
+      onChange = _state$instance.onChange,
+      placeholder = _state$instance.placeholder,
+      searchKey = _state$instance.searchKey,
+      search = _state$instance.search,
+      filter = _state$instance.filter,
+      size = _state$instance.size,
+      isMore = state.isMore,
+      filterValues = state.filterValues,
+      visibleFields = state.visibleFields,
+      orderFields = state.orderFields,
+      customFilterValues = state.customFilterValues;
+
   var handleFilter = function handleFilter(val) {
     var nValue = (0, _objectSpread2.default)({}, filterValues);
 
@@ -67,6 +70,23 @@ var Filter = function Filter() {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(nValue, customFilterValues);
     return false;
+  }; // 一键清空 清空筛选，保留模糊查询
+
+
+  var handleClear = function handleClear() {
+    var _inputRef$current;
+
+    console.log('inputRef.current', inputRef.current.input.value);
+
+    if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
+      inputRef.current.input.value = '';
+    }
+
+    dispatch({
+      type: 'changeFilterValues',
+      filterValues: {}
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange((0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]), customFilterValues);
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
@@ -85,7 +105,10 @@ var Filter = function Filter() {
     return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
       key: v.field
     }, v));
-  }), isMore && /*#__PURE__*/_react.default.createElement(_moreFilters.default, null)), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
+  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    type: "link",
+    onClick: handleClear
+  }, "\u4E00\u952E\u6E05\u7A7A")), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
 };
 
 var _default = Filter;

package/es/CkFilter/filter.js

@@ -56,8 +56,9 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         hasLevelGroup = props.levelGroup;
     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;
+      var isShow = typeof v.show !== 'boolean' || v.show;
+      isShow && (0, _utils.getIsHas)(v === null || v === void 0 ? void 0 : v.value) && (filterValues[v.field] = v.value);
+      return isShow;
     });
 
     var customFilterValues = function customFilterValues() {
@@ -76,7 +77,9 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return v.field;
       }),
       orderFields: data.sort(function (a, b) {
-        return !!b.fixed - !!a.fixed;
+        var bShow = typeof b.show !== 'boolean' || b.show;
+        var aShow = typeof a.show !== 'boolean' || a.show;
+        bShow - aShow;
       }).map(function (v) {
         return v.field;
       }),
@@ -94,7 +97,7 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   (0, _react.useEffect)(function () {
     setOptions();
-  }, []);
+  }, [props]);
   (0, _react.useEffect)(function () {
     dispatch({
       type: 'initInstance',

package/es/CustomTableOption/index.js

@@ -4,16 +4,26 @@ import { Drawer, Tabs, Radio, IconFont, Space, Button } from 'linkmore-design';
 import ColumnsSort from './columnsSort';
 import FilterSort from './filterSort';
 import classNames from 'classnames';
+
+var SmallImg = require('./assets/option1.png');
+
+var DefaultImg = require('./assets/option2.png');
+
+var MiddleImg = require('./assets/option3.png');
+
 var TabPane = Tabs.TabPane;
 var optionsWithDisabled = [{
   label: '紧凑型',
-  value: 'small'
+  value: 'small',
+  imgUrl: SmallImg
 }, {
   label: '默认',
-  value: 'default'
+  value: 'default',
+  imgUrl: DefaultImg
 }, {
   label: '中等',
-  value: 'middle'
+  value: 'middle',
+  imgUrl: MiddleImg
 }];
 var prefixCls = 'lm_custom-table-option';
 var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -43,7 +53,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
     setLmOptions({
       filter: props.filter,
       columns: props.columns,
-      size: props.size
+      size: props.size || 'small'
     });
   }, []);
   /** 提交按钮 */
@@ -67,6 +77,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       filterStateValue: filterStateValue,
       size: lmOptions.size
     });
+    setVisible(false);
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
@@ -93,30 +104,44 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       return setVisible(false);
     }
   }, /*#__PURE__*/React.createElement(Tabs, {
-    defaultActiveKey: "1"
+    defaultActiveKey: "1",
+    destroyInactiveTabPane: true
   }, /*#__PURE__*/React.createElement(TabPane, {
     tab: "\u4E2A\u6027\u5316\u7B5B\u9009",
-    key: "1"
+    key: "1",
+    forceRender: true
   }, /*#__PURE__*/React.createElement(FilterSort, {
     ref: filterRef,
     filter: lmOptions.filter
   })), /*#__PURE__*/React.createElement(TabPane, {
     tab: "\u5217\u5B57\u6BB5\u8BBE\u7F6E",
-    key: "2"
+    key: "2",
+    forceRender: true
   }, /*#__PURE__*/React.createElement(ColumnsSort, {
     ref: columnsRef,
     columns: lmOptions.columns
   })), /*#__PURE__*/React.createElement(TabPane, {
     tab: "\u5176\u4ED6",
-    key: "3"
+    key: "3",
+    forceRender: true
   }, /*#__PURE__*/React.createElement("div", null, "\u5217\u8868\u6837\u5F0F"), /*#__PURE__*/React.createElement(Radio.Group, {
-    options: optionsWithDisabled,
     onChange: function onChange(e) {
       return setLmOptions(Object.assign(Object.assign({}, lmOptions), {
         size: e.target.value
       }));
     },
+    direction: 'row',
+    className: 'lm_size_radio_group',
     value: lmOptions.size
-  })))));
+  }, optionsWithDisabled.map(function (item) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: 'lm_custom_size_warp',
+      key: item.value
+    }, /*#__PURE__*/React.createElement("img", {
+      src: item.imgUrl
+    }), /*#__PURE__*/React.createElement(Radio, {
+      value: item.value
+    }, item.label));
+  }))))));
 });
 export default LMCustomTableOption;

package/es/CustomTableOption/style/index.css

@@ -546,3 +546,19 @@ html {
 .lm_custom_option_columns .lm_custom_icon.hover_show {
   color: var(--primary-color);
 }
+.lm_custom_size_warp {
+  display: flex;
+  flex-direction: column;
+}
+.lm_custom_size_warp > img {
+  width: 100px;
+  height: 100px;
+  margin: 8px 0;
+}
+.lm_size_radio_group {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}

package/es/Descriptions/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export interface IDescriptionsProps {
+    className?: string;
+    style?: React.CSSProperties;
+    children: React.ReactChildren;
+    containerType: 'default' | 'drawer' | 'modal';
+}
+declare const LMDescriptions: React.FC<IDescriptionsProps>;
+export default LMDescriptions;

package/es/Descriptions/index.js

@@ -0,0 +1,39 @@
+import "antd/es/descriptions/style";
+import _Descriptions from "antd/es/descriptions";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+import React from 'react';
+import cx from 'classnames';
+var prefixCls = 'lm_descriptions';
+
+var LMDescriptions = function LMDescriptions(props) {
+  var _cx;
+
+  var children = props.children,
+      className = props.className,
+      _props$containerType = props.containerType,
+      containerType = _props$containerType === void 0 ? 'default' : _props$containerType,
+      others = __rest(props, ["children", "className", "containerType"]);
+
+  var classNames = cx(className, prefixCls, (_cx = {}, _defineProperty(_cx, "".concat(prefixCls, "_default"), containerType === 'default'), _defineProperty(_cx, "".concat(prefixCls, "_drawer"), containerType === 'drawer'), _defineProperty(_cx, "".concat(prefixCls, "_modal"), containerType === 'modal'), _cx));
+  return /*#__PURE__*/React.createElement(_Descriptions, Object.assign({
+    className: classNames
+  }, others, {
+    size: "default"
+  }), children);
+};
+
+export default LMDescriptions;