linkmore-design 1.0.55 → 1.0.58

package/es/LmEditTable/EditTable.js

@@ -1,5 +1,3 @@
-import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
@@ -55,9 +53,9 @@ var __rest = this && this.__rest || function (s, e) {
 
 
 import { PlusCircleOutlined } from '@ant-design/icons';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { arrayMove } from '@dnd-kit/sortable';
-import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch } from 'linkmore-design';
+import { Button, Checkbox, IconFont, Input, InputNumber, Radio, Select, Table, Switch, DatePicker } from 'linkmore-design';
 import { get, set } from 'lodash';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, memo, useCallback } from 'react';
 import { produce } from 'immer';
@@ -199,7 +197,7 @@ var Opetate = function Opetate(_ref) {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/React.createElement(IconFont, {
-      type: "lmweb-plus-circle",
+      type: "lmweb-plus-circle-fill",
       style: {
         fontSize: 16
       }
@@ -252,8 +250,8 @@ var EditableCell = function EditableCell(props) {
       clearProps = __rest(restProps, ["onMouseEnter", "onMouseLeave"]);
 
   var _col$componentProps = col.componentProps,
-      componentProps = _col$componentProps === void 0 ? {} : _col$componentProps;
-  var checkCellRef = useRef(null); // const focusCapturedRef = useRef(false);
+      componentProps = _col$componentProps === void 0 ? {} : _col$componentProps; // const checkCellRef = useRef(null)
+  // const focusCapturedRef = useRef(false);
   // const curValue = useMemo(() => {
   //   return record?.dataIndex
   // }, [record])
@@ -319,7 +317,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/React.createElement(Input, Object.assign({
           onPressEnter: handleFormItemChange,
           onBlur: handleFormItemChange,
-          ref: checkCellRef,
+          // ref={checkCellRef}
           placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps, {
           addonBefore: componentProps.addonBefore ? /*#__PURE__*/React.createElement(_Form.Item, {
@@ -338,8 +336,7 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/React.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
+          onChange: handleFormItemChange
         }, componentProps));
 
       case 'number':
@@ -349,15 +346,13 @@ var EditableCell = function EditableCell(props) {
           style: {
             width: (editEnum === null || editEnum === void 0 ? void 0 : editEnum.width) || '100%'
           },
-          placeholder: "\u8BF7\u8F93\u5165",
-          ref: checkCellRef
+          placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps));
 
       case 'date':
         // @ts-ignore
-        return /*#__PURE__*/React.createElement(_DatePicker, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
+        return /*#__PURE__*/React.createElement(DatePicker, Object.assign({
+          onChange: handleFormItemChange
         }, componentProps));
 
       case 'select':
@@ -365,7 +360,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          ref: checkCellRef,
+          // ref={checkCellRef}
           filterOption: function filterOption(input, option) {
             var _a, _b;
 
@@ -381,7 +376,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          ref: checkCellRef,
+          // ref={checkCellRef}
           filterOption: function filterOption(input, option) {
             var _a;
 
@@ -393,20 +388,13 @@ var EditableCell = function EditableCell(props) {
 
       case 'checkbox':
         return /*#__PURE__*/React.createElement(Checkbox.Group, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
+          onChange: handleFormItemChange
         }, componentProps));
 
       case 'radio':
         return /*#__PURE__*/React.createElement(Radio.Group, Object.assign({
-          onChange: handleFormItemChange,
-          ref: checkCellRef
-        }, componentProps), editEnum === null || editEnum === void 0 ? void 0 : editEnum.map(function (v) {
-          return /*#__PURE__*/React.createElement(Radio, {
-            key: v.value,
-            value: v.value
-          }, v.label);
-        }));
+          onChange: handleFormItemChange
+        }, componentProps));
 
       case 'switch':
         return /*#__PURE__*/React.createElement(Switch, {
@@ -416,7 +404,7 @@ var EditableCell = function EditableCell(props) {
       case 'upload':
         return /*#__PURE__*/React.createElement(UploadSingle, {
           editEnum: componentProps,
-          ref: checkCellRef,
+          // ref={checkCellRef}
           onChange: handleFormItemChange
         });
 
@@ -425,7 +413,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/React.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          ref: checkCellRef,
+          // ref={checkCellRef}
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength
@@ -442,8 +430,7 @@ var EditableCell = function EditableCell(props) {
       default:
         return /*#__PURE__*/React.createElement(Input, Object.assign({
           onPressEnter: handleFormItemChange,
-          onBlur: handleFormItemChange,
-          ref: checkCellRef
+          onBlur: handleFormItemChange
         }, componentProps));
     }
   };
@@ -485,7 +472,7 @@ var EditableCell = function EditableCell(props) {
         dataIndex = col.dataIndex;
 
     if (isEdit && editable && record[dataIndex] || isHoverEdit && editable && record[dataIndex]) {
-      form.setFieldsValue(_defineProperty({}, dataIndex, editable === 'date' ? dayjs(record[dataIndex]) : record[dataIndex]));
+      form.setFieldsValue(_defineProperty({}, dataIndex, editable === 'date' ? moment(record[dataIndex]) : record[dataIndex]));
     }
   }, [record]); // const isOpenEdit = (isEdit && focusCapturedRef.current) || (isHoverEdit && focusCapturedRef.current);
   // const classNames = cx({
@@ -574,7 +561,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     var newIndex = cloneArr.findIndex(function (v) {
       return v[_rowKey] === over;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(arrayMove(cloneArr, oldIndex, newIndex));
+
+    if (onChange) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(arrayMove(cloneArr, oldIndex, newIndex));
+    } else {
+      setDataSource(arrayMove(cloneArr, oldIndex, newIndex));
+    }
   }; // 删除
 
 
@@ -644,6 +636,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     });
     console.time('b');
+    console.log(res, 'rrrr');
 
     if (onChange) {
       onChange === null || onChange === void 0 ? void 0 : onChange(res);
@@ -880,13 +873,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   })), isShowAddAction && /*#__PURE__*/React.createElement(Button, {
     className: "lm_editTable_add_bar",
     type: "dashed",
-    block: true,
     onClick: handleAdd,
     style: {
       marginTop: 8
     }
   }, /*#__PURE__*/React.createElement(PlusCircleOutlined, {
-    className: "lm_editTable_add_icon"
+    className: "lmweb-plus"
   }), "\u65B0\u589E"));
 });
 export default /*#__PURE__*/memo(EditTable);

package/es/LmFilter/Controls/CheckboxTags.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+// 复选标签组件，选中字段，多选
+var CheckboxTags = function CheckboxTags(_ref) {
+  var value = _ref.value,
+      onChange = _ref.onChange,
+      options = _ref.options;
+
+  var handleClick = function handleClick(item) {
+    var oriValue = value || []; // 源数据
+
+    var has = oriValue === null || oriValue === void 0 ? void 0 : oriValue.includes(item.value); // 是否已被选中
+
+    var nValue = has ? oriValue.filter(function (v) {
+      return v !== item.value;
+    }) : [].concat((0, _toConsumableArray2.default)(oriValue), [item.value]);
+    onChange === null || onChange === void 0 ? void 0 : onChange(nValue); // 返回选中的数据
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
+    size: 8,
+    wrap: true,
+    className: "auto_height"
+  }, options === null || options === void 0 ? void 0 : options.map(function (v) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      key: v.value,
+      className: (0, _classnames.default)('checkbox_tag', {
+        active: value === null || value === void 0 ? void 0 : value.includes(v.value)
+      }),
+      onClick: function onClick() {
+        return handleClick(v);
+      }
+    }, v.label);
+  })));
+};
+
+var _default = CheckboxTags;
+exports.default = _default;

package/es/LmFilter/Controls/index.js

@@ -0,0 +1,77 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/input/style");
+
+var _input = _interopRequireDefault(require("antd/es/input"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _CheckboxTags = _interopRequireDefault(require("./CheckboxTags"));
+
+var _CascaderFilter = _interopRequireDefault(require("../components/CascaderFilter"));
+
+var _DateFilter = _interopRequireDefault(require("../components/DateFilter"));
+
+var _excluded = ["item", "options"];
+
+var Controls = function Controls(props) {
+  var _props$item = props.item,
+      item = _props$item === void 0 ? {} : _props$item,
+      options = props.options,
+      resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var type = item.type;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var instance = {
+    filterValue: resetProps.value,
+    setFilterValue: resetProps.onChange,
+    visible: visible,
+    setVisible: setVisible,
+    children: null
+  };
+  var obj = {
+    'select': /*#__PURE__*/_react.default.createElement(_CheckboxTags.default, (0, _extends2.default)({
+      options: options
+    }, resetProps)),
+    'checkbox': /*#__PURE__*/_react.default.createElement(_CheckboxTags.default, (0, _extends2.default)({
+      options: options
+    }, resetProps)),
+    'cascader': /*#__PURE__*/_react.default.createElement(_CascaderFilter.default, {
+      instance: instance,
+      item: item,
+      options: options
+    }),
+    'date': /*#__PURE__*/_react.default.createElement(_DateFilter.default, {
+      instance: instance,
+      item: item,
+      options: options
+    }),
+    'input': /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+      placeholder: "\u8BF7\u8F93\u5165"
+    }, resetProps)) // 'nested': <Nested options={options} {...resetProps} />,
+
+  };
+  return obj[type] || null;
+};
+
+var _default = Controls;
+exports.default = _default;

package/es/LmFilter/LmFilter.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,15 +11,27 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
-var LmFilter = function LmFilter(props, ref) {
+var _localization = require("./localization.tsx");
+
+var _excluded = ["localization"];
+
+var LmFilter = function LmFilter(_ref, ref) {
+  var _ref$localization = _ref.localization,
+      localization = _ref$localization === void 0 ? {} : _ref$localization,
+      resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var defaultRef = (0, _react.useRef)(null);
   return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
-    ref: ref || defaultRef
-  }, props));
+    ref: ref || defaultRef,
+    localization: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _localization.DefaultLocalization), localization)
+  }, resetProps));
 };
 
 var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);