linkmore-design 1.0.34 → 1.0.37

package/lib/CustomTableOption/columnsSort.js

@@ -25,6 +25,8 @@ var _utilities = require("@dnd-kit/utilities");
 
 var _lodash = require("lodash");
 
+var Search = _linkmoreDesign.Input.Search;
+
 var SortItem = function SortItem(props) {
   var _a, _b, _c, _d;
 
@@ -100,20 +102,36 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       colStateValue = _useState4[0],
       setColStateValue = _useState4[1];
+  /** 正在输入的查询条件 */
+
+
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      searchIngValue = _useState6[0],
+      setSearchIngValue = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(''),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
 
   var sortMenu = (0, _react.useMemo)(function () {
-    var cloneCol = (0, _lodash.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 = (0, _lodash.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 = [];
@@ -132,7 +150,7 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       rigthSortItem: rigthSortItem,
       items: items
     };
-  }, [localColumns, colStateValue]);
+  }, [localColumns, colStateValue, searchValue]);
   var isCheckAll = (0, _react.useMemo)(function () {
     var showLength = localColumns.filter(function (item) {
       return item.show !== false;
@@ -142,6 +160,12 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       checkAll: showLength.length === localColumns.length
     };
   }, [localColumns]);
+  /** 将当前输入的值，进行最后赋值，作自动计算使用 */
+
+  var handleSearch = function handleSearch() {
+    setSearchValue(searchIngValue);
+  };
+
   (0, _react.useEffect)(function () {
     setLocalColumns(columns);
     setColStateValue(ColumnsStateValue);
@@ -264,6 +288,14 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'lm_custom_option_columns'
   }, /*#__PURE__*/_react.default.createElement("div", {
+    className: 'global_search'
+  }, /*#__PURE__*/_react.default.createElement(Search, {
+    value: searchIngValue,
+    onChange: function onChange(e) {
+      return setSearchIngValue(e.target.value);
+    },
+    onSearch: handleSearch
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: 'global_setting'
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: isCheckAll.indeterminate,

package/lib/CustomTableOption/filterSort.js

@@ -26,6 +26,7 @@ var _utilities = require("@dnd-kit/utilities");
 var _lodash = require("lodash");
 
 var UNLLVALUE = [null, undefined];
+var Search = _linkmoreDesign.Input.Search;
 
 var SortItem = function SortItem(props) {
   var _a, _b;
@@ -75,6 +76,18 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       colStateValue = _useState4[0],
       setColStateValue = _useState4[1];
+  /** 正在输入的查询条件 */
+
+
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      searchIngValue = _useState6[0],
+      setSearchIngValue = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(''),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
 
   var sortMenu = (0, _react.useMemo)(function () {
     var cloneCol = (0, _lodash.cloneDeep)(localFilter);
@@ -85,8 +98,12 @@ var FilterSort = /*#__PURE__*/(0, _react.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 = (0, _react.useMemo)(function () {
     var showLength = localFilter.filter(function (item) {
       return item.show !== false;
@@ -96,6 +113,12 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       checkAll: showLength.length === localFilter.length
     };
   }, [localFilter]);
+  /** 将当前输入的值，进行最后赋值，作自动计算使用 */
+
+  var handleSearch = function handleSearch() {
+    setSearchValue(searchIngValue);
+  };
+
   (0, _react.useEffect)(function () {
     console.log(localFilter, 'localFilter');
   }, [localFilter]);
@@ -120,7 +143,6 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
         var newIndex = items.findIndex(function (s) {
           return s.field === over.id;
         });
-        console.log((0, _sortable.arrayMove)(items, oldIndex, newIndex), 77);
         return (0, _sortable.arrayMove)(items, oldIndex, newIndex).map(function (item, index) {
           return Object.assign(Object.assign({}, item), {
             order: index
@@ -182,6 +204,14 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'lm_custom_option_columns'
   }, /*#__PURE__*/_react.default.createElement("div", {
+    className: 'global_search'
+  }, /*#__PURE__*/_react.default.createElement(Search, {
+    value: searchIngValue,
+    onChange: function onChange(e) {
+      return setSearchIngValue(e.target.value);
+    },
+    onSearch: handleSearch
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: 'global_setting'
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: isCheckAll.indeterminate,

package/lib/CustomTableOption/index.js

@@ -51,15 +51,22 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
+  /** 是否记住页面使用状态 */
 
-  var _useState3 = (0, _react.useState)({
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      saveSetting = _useState4[0],
+      setSaveSetting = _useState4[1];
+
+  var _useState5 = (0, _react.useState)({
     filter: [],
     columns: [],
     size: 'small'
   }),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      lmOptions = _useState4[0],
-      setLmOptions = _useState4[1];
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      lmOptions = _useState6[0],
+      setLmOptions = _useState6[1];
 
   var openSetting = function openSetting() {
     setVisible(true);
@@ -71,7 +78,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       columns: props.columns,
       size: props.size || 'small'
     });
-  }, []);
+  }, [props.filter, props.columns, props.size]);
   /** 提交按钮 */
 
   var onOk = function onOk() {
@@ -91,7 +98,8 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       ColStateValue: ColStateValue,
       filterData: filterData,
       filterStateValue: filterStateValue,
-      size: lmOptions.size
+      size: lmOptions.size,
+      saveSetting: saveSetting
     });
     setVisible(false);
   };
@@ -146,7 +154,6 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
         size: e.target.value
       }));
     },
-    direction: 'row',
     className: 'lm_size_radio_group',
     value: lmOptions.size
   }, optionsWithDisabled.map(function (item) {
@@ -154,10 +161,20 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       className: 'lm_custom_size_warp',
       key: item.value
     }, /*#__PURE__*/_react.default.createElement("img", {
+      onClick: function onClick() {
+        return setLmOptions(Object.assign(Object.assign({}, lmOptions), {
+          size: item.value
+        }));
+      },
       src: item.imgUrl
     }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
       value: item.value
     }, item.label));
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: 'save_setting'
+  }, /*#__PURE__*/_react.default.createElement("span", null, "\u662F\u5426\u8BB0\u4F4F\u9875\u9762\u4F7F\u7528\u72B6\u6001"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, {
+    checked: saveSetting,
+    onChange: setSaveSetting
   }))))));
 });
 var _default = LMCustomTableOption;

package/lib/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;
@@ -549,6 +562,9 @@ html {
 .lm_custom_size_warp {
   display: flex;
   flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
 }
 .lm_custom_size_warp > img {
   width: 100px;
@@ -562,3 +578,16 @@ html {
   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/lib/Dropdown/index.js

@@ -17,6 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var __rest = void 0 && (void 0).__rest || function (s, e) {
@@ -87,7 +89,8 @@ var LMDropdown = CLMDropdown;
 
 LMDropdown.Button = function (props) {
   var _props$dropdownmatchw2 = props.dropdownmatchwidth,
-      dropdownmatchwidth = _props$dropdownmatchw2 === void 0 ? false : _props$dropdownmatchw2;
+      dropdownmatchwidth = _props$dropdownmatchw2 === void 0 ? false : _props$dropdownmatchw2,
+      icon = props.icon;
   var dropdownRef = (0, _react.useRef)(null);
 
   var _useState3 = (0, _react.useState)(''),
@@ -109,6 +112,10 @@ LMDropdown.Button = function (props) {
 
   if (!dropdownmatchwidth) {
     return /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({}, props, {
+      icon: icon || /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+        className: 'lm_default_icon',
+        type: 'lmweb-down'
+      }),
       overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
       className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '')
     }));
@@ -117,6 +124,10 @@ LMDropdown.Button = function (props) {
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: dropdownRef
   }, /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({}, props, {
+    icon: icon || /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      className: 'lm_default_icon',
+      type: 'lmweb-down'
+    }),
     overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
     overlayStyle: minwidth ? Object.assign({
       minWidth: minwidth

package/lib/Dropdown/style/index.css

@@ -551,6 +551,12 @@ html {
 .lm_dropdown_button .ant-btn.ant-btn-sm {
   font-size: 12px;
 }
+.lm_dropdown_button .ant-btn .anticon {
+  font-size: 16px;
+}
+.lm_dropdown_button .ant-btn .lm_default_icon {
+  color: var(--text-color);
+}
 .lm_dropdown_button:hover {
   color: var(--primary-hover-color) !important;
   border: 1px solid var(--primary-hover-color);

package/lib/EditTable/EditTable.js

@@ -211,6 +211,16 @@ var EditableRow = function EditableRow(_ref3) {
     value: form
   }, /*#__PURE__*/_react.default.createElement("tr", props)));
 };
+
+var isValidValue = function isValidValue(verifyValue) {
+  var toStringValue = JSON.stringify(verifyValue);
+
+  if (verifyValue === undefined || verifyValue === null || verifyValue === '' || toStringValue === '[]' || toStringValue === '{}') {
+    return false;
+  }
+
+  return true;
+};
 /*
   表格单元格
   editEnum： 下拉框时的数据数组（非数组时是配置设置）
@@ -243,6 +253,8 @@ var EditableCell = function EditableCell(props) {
       setEditing = _useState2[1];
 
   var focusCapturedRef = (0, _react.useRef)(false);
+  var curValue = (0, _lodash.get)(record, dataIndex);
+  var curValueIsValid = isValidValue(curValue);
 
   var getDefaultChildNode = function getDefaultChildNode() {
     var focusCaptured = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -260,8 +272,18 @@ var EditableCell = function EditableCell(props) {
       }
     }
 
-    if (focusCaptured) {
-      if (isHoverEdit && editable) {
+    if (isHoverEdit && editable) {
+      if (focusCaptured) {
+        childNode = /*#__PURE__*/_react.default.createElement(_form.default.Item, (0, _extends2.default)({
+          style: {
+            margin: 0
+          }
+        }, itemProps, {
+          name: dataIndex
+        }), Control(editable));
+      }
+
+      if (!curValueIsValid) {
         childNode = /*#__PURE__*/_react.default.createElement(_form.default.Item, (0, _extends2.default)({
           style: {
             margin: 0
@@ -474,7 +496,7 @@ var EditableCell = function EditableCell(props) {
   var isOpenEdit = isEdit && focusCapturedRef.current || isHoverEdit && focusCapturedRef.current;
   var classNames = (0, _classnames.default)({
     'lm_base_editTable_cell': true,
-    'lm_base_editTable_cell_edit': isOpenEdit
+    'lm_base_editTable_cell_edit': isOpenEdit || isHoverEdit && !curValueIsValid
   });
   var extensionConfig = {};
 
@@ -493,7 +515,8 @@ var EditableCell = function EditableCell(props) {
       var rowValue = (0, _lodash.get)(record, rowKey);
       reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue);
     } else {
-      var newChildNode = getDefaultChildNode(false); // setChildNode(newChildNode);
+      var newChildNode = getDefaultChildNode(false);
+      setChildNode(newChildNode);
     }
   };
 

package/lib/Form/index.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+import { Form as AntdForm, FormInstance, FormProps, List } from 'antd';
+import useFormInstance from 'antd/lib/form/hooks/useFormInstance';
+import { FormProvider } from 'antd/lib/form/context';
+import { useForm, useWatch } from 'antd/lib/form/Form';
+declare const Reform: <Values = any>(props: FormProps<Values> & {
+    children?: React.ReactNode;
+} & {
+    ref?: React.Ref<FormInstance<Values>>;
+}) => React.ReactElement;
+declare type InternalFormType = typeof Reform;
+interface FormInterface extends InternalFormType {
+    useForm: typeof useForm;
+    useFormInstance: typeof useFormInstance;
+    useWatch: typeof useWatch;
+    Item: typeof AntdForm.Item;
+    List: typeof List;
+    ErrorList: typeof AntdForm.ErrorList;
+    Provider: typeof FormProvider;
+    /** @deprecated Only for warning usage. Do not use. */
+    create: () => void;
+}
+declare const Form: FormInterface;
+export default Form;

package/lib/Form/index.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/list/style");
+
+var _list = _interopRequireDefault(require("antd/es/list"));
+
+require("antd/es/form/style");
+
+var _form = _interopRequireDefault(require("antd/es/form"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _useFormInstance = _interopRequireDefault(require("antd/lib/form/hooks/useFormInstance"));
+
+var _context = require("antd/lib/form/context");
+
+var _Form2 = require("antd/lib/form/Form");
+
+var __rest = void 0 && (void 0).__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;
+};
+
+var classNamePrefix = 'lm_form';
+
+var LMForm = function LMForm(props, ref) {
+  var children = props.children,
+      className = props.className,
+      restProps = __rest(props, ["children", "className"]);
+
+  return /*#__PURE__*/_react.default.createElement(_form.default, Object.assign({
+    ref: ref,
+    className: (0, _classnames.default)(classNamePrefix, className),
+    colon: false
+  }, restProps), children);
+};
+
+var Reform = /*#__PURE__*/_react.default.forwardRef(LMForm);
+
+var Form = Reform;
+Form.Item = _form.default.Item;
+Form.List = _list.default;
+Form.ErrorList = _form.default.ErrorList;
+Form.useForm = _Form2.useForm;
+Form.useFormInstance = _useFormInstance.default;
+Form.useWatch = _Form2.useWatch;
+Form.Provider = _context.FormProvider;
+
+Form.create = function () {
+  warning(false, 'Form', 'antd v4 removed `Form.create`. Please remove or use `@ant-design/compatible` instead.');
+};
+
+var _default = Form;
+exports.default = _default;
+
+function warning(arg0, arg1, arg2) {
+  throw new Error('Function not implemented.');
+}