linkmore-design 1.0.33 → 1.0.36

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/columnsSort.js

@@ -2,10 +2,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState, useMemo, useEffect, useImperativeHandle, forwardRef } from 'react';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { IconFont, Checkbox } from 'linkmore-design';
+import { IconFont, Checkbox, Input } from 'linkmore-design';
 import { HolderOutlined } from '@ant-design/icons';
 import { CSS } from '@dnd-kit/utilities';
 import { cloneDeep } from 'lodash';
+var Search = Input.Search;
 
 var SortItem = function SortItem(props) {
   var _a, _b, _c, _d;
@@ -82,20 +83,36 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       _useState4 = _slicedToArray(_useState3, 2),
       colStateValue = _useState4[0],
       setColStateValue = _useState4[1];
+  /** 正在输入的查询条件 */
+
+
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      searchIngValue = _useState6[0],
+      setSearchIngValue = _useState6[1];
+
+  var _useState7 = useState(''),
+      _useState8 = _slicedToArray(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
 
   var sortMenu = useMemo(function () {
-    var cloneCol = cloneDeep(localColumns);
-    cloneCol.forEach(function (item, index) {
-      var _a, _b;
+    var _a;
 
-      var fixed = (_a = ColumnsStateValue[item.dataIndex]) === null || _a === void 0 ? void 0 : _a.fixed;
-      var order = (_b = ColumnsStateValue[item.dataIndex]) === null || _b === void 0 ? void 0 : _b.order;
+    var cloneCol = (_a = cloneDeep(localColumns)) === null || _a === void 0 ? void 0 : _a.filter(function (item) {
+      var _a;
 
-      if (!!fixed) {
-        item.fixed = fixed;
-      }
+      return ((_a = item.title) === null || _a === void 0 ? void 0 : _a.indexOf(searchValue)) > -1;
+    });
+    cloneCol.forEach(function (item, index) {
+      var _a, _b, _c;
 
-      item.order = order !== undefined && order !== null ? order : index;
+      if (ColumnsStateValue === null || ColumnsStateValue === void 0 ? void 0 : ColumnsStateValue.hasOwnProperty(item.dataIndex)) {
+        var order = (_a = ColumnsStateValue[item.dataIndex]) === null || _a === void 0 ? void 0 : _a.order;
+        item.fixed = ((_b = ColumnsStateValue[item.dataIndex]) === null || _b === void 0 ? void 0 : _b.fixed) || undefined;
+        item.order = [undefined, null].includes(order) ? index : order;
+        item.show = ((_c = ColumnsStateValue[item.dataIndex]) === null || _c === void 0 ? void 0 : _c.show) === false ? false : true;
+      }
     });
     var leftSortItem = [];
     var rigthSortItem = [];
@@ -114,7 +131,7 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       rigthSortItem: rigthSortItem,
       items: items
     };
-  }, [localColumns, colStateValue]);
+  }, [localColumns, colStateValue, searchValue]);
   var isCheckAll = useMemo(function () {
     var showLength = localColumns.filter(function (item) {
       return item.show !== false;
@@ -124,6 +141,12 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       checkAll: showLength.length === localColumns.length
     };
   }, [localColumns]);
+  /** 将当前输入的值，进行最后赋值，作自动计算使用 */
+
+  var handleSearch = function handleSearch() {
+    setSearchValue(searchIngValue);
+  };
+
   useEffect(function () {
     setLocalColumns(columns);
     setColStateValue(ColumnsStateValue);
@@ -246,6 +269,14 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: 'lm_custom_option_columns'
   }, /*#__PURE__*/React.createElement("div", {
+    className: 'global_search'
+  }, /*#__PURE__*/React.createElement(Search, {
+    value: searchIngValue,
+    onChange: function onChange(e) {
+      return setSearchIngValue(e.target.value);
+    },
+    onSearch: handleSearch
+  })), /*#__PURE__*/React.createElement("div", {
     className: 'global_setting'
   }, /*#__PURE__*/React.createElement(Checkbox, {
     indeterminate: isCheckAll.indeterminate,

package/es/CustomTableOption/filterSort.js

@@ -2,11 +2,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState, useMemo, useEffect, useImperativeHandle, forwardRef } from 'react';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { Checkbox } from 'linkmore-design';
+import { Checkbox, Input } from 'linkmore-design';
 import { HolderOutlined } from '@ant-design/icons';
 import { CSS } from '@dnd-kit/utilities';
 import { cloneDeep } from 'lodash';
 var UNLLVALUE = [null, undefined];
+var Search = Input.Search;
 
 var SortItem = function SortItem(props) {
   var _a, _b;
@@ -56,6 +57,18 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       _useState4 = _slicedToArray(_useState3, 2),
       colStateValue = _useState4[0],
       setColStateValue = _useState4[1];
+  /** 正在输入的查询条件 */
+
+
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      searchIngValue = _useState6[0],
+      setSearchIngValue = _useState6[1];
+
+  var _useState7 = useState(''),
+      _useState8 = _slicedToArray(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
 
   var sortMenu = useMemo(function () {
     var cloneCol = cloneDeep(localFilter);
@@ -66,8 +79,12 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       item.order = order !== undefined && order !== null ? order : UNLLVALUE.includes(item.order) ? index : item.order;
       item.show = ((_b = filterStateValue[item.field]) === null || _b === void 0 ? void 0 : _b.show) === false ? false : UNLLVALUE.includes(item.show) ? true : !!item.show;
     });
-    return cloneCol;
-  }, [localFilter, colStateValue]);
+    return cloneCol.filter(function (item) {
+      var _a;
+
+      return ((_a = item.title) === null || _a === void 0 ? void 0 : _a.indexOf(searchValue)) > -1;
+    });
+  }, [localFilter, colStateValue, searchValue]);
   var isCheckAll = useMemo(function () {
     var showLength = localFilter.filter(function (item) {
       return item.show !== false;
@@ -77,6 +94,12 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       checkAll: showLength.length === localFilter.length
     };
   }, [localFilter]);
+  /** 将当前输入的值，进行最后赋值，作自动计算使用 */
+
+  var handleSearch = function handleSearch() {
+    setSearchValue(searchIngValue);
+  };
+
   useEffect(function () {
     console.log(localFilter, 'localFilter');
   }, [localFilter]);
@@ -101,7 +124,6 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
         var newIndex = items.findIndex(function (s) {
           return s.field === over.id;
         });
-        console.log(arrayMove(items, oldIndex, newIndex), 77);
         return arrayMove(items, oldIndex, newIndex).map(function (item, index) {
           return Object.assign(Object.assign({}, item), {
             order: index
@@ -163,6 +185,14 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: 'lm_custom_option_columns'
   }, /*#__PURE__*/React.createElement("div", {
+    className: 'global_search'
+  }, /*#__PURE__*/React.createElement(Search, {
+    value: searchIngValue,
+    onChange: function onChange(e) {
+      return setSearchIngValue(e.target.value);
+    },
+    onSearch: handleSearch
+  })), /*#__PURE__*/React.createElement("div", {
     className: 'global_setting'
   }, /*#__PURE__*/React.createElement(Checkbox, {
     indeterminate: isCheckAll.indeterminate,

package/es/CustomTableOption/index.js

@@ -1,19 +1,29 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { forwardRef, useState, useEffect, useRef } from 'react';
-import { Drawer, Tabs, Radio, IconFont, Space, Button } from 'linkmore-design';
+import { Drawer, Tabs, Radio, IconFont, Space, Button, Switch } 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) {
@@ -25,15 +35,22 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
+  /** 是否记住页面使用状态 */
+
 
-  var _useState3 = useState({
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      saveSetting = _useState4[0],
+      setSaveSetting = _useState4[1];
+
+  var _useState5 = useState({
     filter: [],
     columns: [],
     size: 'small'
   }),
-      _useState4 = _slicedToArray(_useState3, 2),
-      lmOptions = _useState4[0],
-      setLmOptions = _useState4[1];
+      _useState6 = _slicedToArray(_useState5, 2),
+      lmOptions = _useState6[0],
+      setLmOptions = _useState6[1];
 
   var openSetting = function openSetting() {
     setVisible(true);
@@ -43,9 +60,9 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
     setLmOptions({
       filter: props.filter,
       columns: props.columns,
-      size: props.size
+      size: props.size || 'small'
     });
-  }, []);
+  }, [props.filter, props.columns, props.size]);
   /** 提交按钮 */
 
   var onOk = function onOk() {
@@ -65,8 +82,10 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       ColStateValue: ColStateValue,
       filterData: filterData,
       filterStateValue: filterStateValue,
-      size: lmOptions.size
+      size: lmOptions.size,
+      saveSetting: saveSetting
     });
+    setVisible(false);
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconFont, {
@@ -93,30 +112,53 @@ 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
       }));
     },
+    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", {
+      onClick: function onClick() {
+        return setLmOptions(Object.assign(Object.assign({}, lmOptions), {
+          size: item.value
+        }));
+      },
+      src: item.imgUrl
+    }), /*#__PURE__*/React.createElement(Radio, {
+      value: item.value
+    }, item.label));
+  })), /*#__PURE__*/React.createElement("div", {
+    className: 'save_setting'
+  }, /*#__PURE__*/React.createElement("span", null, "\u662F\u5426\u8BB0\u4F4F\u9875\u9762\u4F7F\u7528\u72B6\u6001"), /*#__PURE__*/React.createElement(Switch, {
+    checked: saveSetting,
+    onChange: setSaveSetting
+  }))))));
 });
 export default LMCustomTableOption;

package/es/CustomTableOption/style/index.css

@@ -503,6 +503,15 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+.lm_custom-table-option.lm_drawer .ant-drawer-body {
+  padding: 0 0 24px 0;
+}
+.lm_custom-table-option.lm_drawer .ant-drawer-body .ant-tabs-nav-wrap {
+  padding: 0 24px;
+}
+.lm_custom-table-option.lm_drawer .ant-drawer-body .ant-tabs-content-holder {
+  padding: 0 24px;
+}
 .lm_custom_option_columns .global_setting {
   height: 44px;
   background-color: var(--color-4);
@@ -516,6 +525,10 @@ html {
 .lm_custom_option_columns .global_setting .lm-checkbox > span {
   font-size: 12px;
 }
+.lm_custom_option_columns .global_setting > span {
+  color: var(--primary-color);
+  cursor: pointer;
+}
 .lm_custom_option_columns .fixed_title {
   color: var(--color-45);
   font-size: 12px;
@@ -546,3 +559,35 @@ html {
 .lm_custom_option_columns .lm_custom_icon.hover_show {
   color: var(--primary-color);
 }
+.lm_custom_size_warp {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+.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;
+}
+.save_setting {
+  height: 68px;
+  margin-top: 24px;
+  border-top: 1px solid var(--color-6);
+  border-bottom: 1px solid var(--color-6);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+}
+.global_search {
+  margin-bottom: 16px;
+}

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;