linkmore-design 1.0.66 → 1.0.69

package/lib/Empty/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_empty {
   display: flex;
   flex-direction: column;

package/lib/Filter/baseFilter/Popover.js

@@ -91,7 +91,6 @@ var Index = function Index(props) {
     var _data$find, _data$find2;
 
     var result = showTitle();
-    console.log(useValue, 'useValue');
 
     if (result) {
       if (useValue || typeof useValue === 'number') {

package/lib/Filter/baseFilter/ToggleFilter.js

@@ -44,7 +44,6 @@ var ToggleFilter = function ToggleFilter(_ref) {
 
 
   var resetList = function resetList(value) {
-    console.log('value', value);
     var fixed = !value.fixed;
     var nValue = useList.map(function (v) {
       var obj = fixed ? useList.find(function (o) {

package/lib/Filter/edit/editFilter.js

@@ -176,14 +176,10 @@ var Index = function Index(props) {
   }; // 新增筛选项
 
 
-  var addEvent = function addEvent() {
-    console.log('新增筛选项！');
-  }; // 单个筛选项筛选值变化
+  var addEvent = function addEvent() {}; // 单个筛选项筛选值变化
 
 
-  var getChange = function getChange(e) {
-    console.log('getChange', e);
-  }; // 删除单个筛选项
+  var getChange = function getChange(e) {}; // 删除单个筛选项
 
 
   var listItemOnClose = function listItemOnClose(field) {

package/lib/Filter/remember.js

@@ -63,7 +63,6 @@ var Index = function Index(props) {
   var editList = function editList(e, item) {
     e === null || e === void 0 ? void 0 : e.stopPropagation();
     setVisible(true);
-    console.log('item', item);
   }; // 创建筛选
 
 

package/lib/Filter/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_filter {
   display: flex;
   align-items: center;

package/lib/Form/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_form .ant-form-item {
   margin-bottom: 16px;
 }

package/lib/Grid/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/Icon/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/IconFont/font/iconfont.js

@@ -18,7 +18,7 @@
     try {
       document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>");
     } catch (c) {
-      console && console.log(c);
+      console && void 0;
     }
   }
 

package/lib/Image/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/Input/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_input {
   height: 32px;
   padding: 2px 8px;

package/lib/InputNumber/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_input-number.ant-input-number {
   border: 1px solid var(--color-15);
 }

package/lib/Layout/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/LeftTable/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_grid_tree {
   position: relative;
   font-size: 12px;

package/lib/List/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/LmEditTable/DragHandle.js

@@ -26,7 +26,8 @@ var Dragger = function Dragger(_ref) {
     type: "lmweb-icon-m-receipt1"
   }, listeners, {
     style: {
-      touchAction: 'none'
+      touchAction: 'none',
+      cursor: 'move'
     },
     className: 'icon_drag' + (isDragging ? 'bing' : '')
   }));

package/lib/LmEditTable/EditTable.js

@@ -289,7 +289,25 @@ var EditableCell = function EditableCell(props) {
 
   var _col$componentProps = col.componentProps,
       componentProps = _col$componentProps === void 0 ? {} : _col$componentProps,
-      dataIndex = col.dataIndex; // const checkCellRef = useRef(null)
+      dataIndex = col.dataIndex;
+  /** 是否正在编辑中 */
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      editing = _useState2[0],
+      setEditing = _useState2[1];
+
+  var inputRef = (0, _react.useRef)(null);
+  var form = (0, _react.useContext)(EditableContext);
+  (0, _react.useEffect)(function () {
+    if (editing) {
+      inputRef.current.focus();
+    }
+  }, [editing]);
+
+  var toggleEdit = function toggleEdit() {
+    setEditing(!editing); // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
+  }; // const checkCellRef = useRef(null)
   // const focusCapturedRef = useRef(false);
   // const curValue = useMemo(() => {
   //   return record?.dataIndex
@@ -297,6 +315,7 @@ var EditableCell = function EditableCell(props) {
   // const curValueIsValid = isValidValue(curValue);
   // 校验保存
 
+
   var save = function save(row) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var values;
@@ -340,19 +359,29 @@ var EditableCell = function EditableCell(props) {
               return form.validateFields();
 
             case 10:
-              _context.next = 14;
+              if (col === null || col === void 0 ? void 0 : col.hoverEdit) {
+                toggleEdit();
+              } // // 清空异常校验
+              // setValid((old) => {
+              //   const obj = { ...old }
+              //   delete obj[record[rowKey]]
+              //   return obj
+              // })
+
+
+              _context.next = 15;
               break;
 
-            case 12:
-              _context.prev = 12;
+            case 13:
+              _context.prev = 13;
               _context.t1 = _context["catch"](0);
 
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 12]]);
+      }, _callee, null, [[0, 13]]);
     }));
   }; // 触发保存
 
@@ -371,7 +400,6 @@ var EditableCell = function EditableCell(props) {
 
   var copyKey = function copyKey(e) {
     e === null || e === void 0 ? void 0 : e.stopPropagation();
-    console.log(rowKey, record[rowKey], 'fff');
     var dataIndex = col.dataIndex;
     handleCopy === null || handleCopy === void 0 ? void 0 : handleCopy(dataIndex, record[dataIndex]);
   };
@@ -382,7 +410,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
           onPressEnter: handleFormItemChange,
           onBlur: handleFormItemChange,
-          // ref={checkCellRef}
+          ref: inputRef,
           placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps, {
           addonBefore: componentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
@@ -397,7 +425,9 @@ var EditableCell = function EditableCell(props) {
           }, /*#__PURE__*/_react.default.cloneElement(componentProps.addonAfter, {
             onChange: handleFormItemChange
           })) : null,
-          suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+          suffix: componentProps.quickcopy ? /*#__PURE__*/_react.default.createElement("span", {
+            className: 'lm_table_quickcopy'
+          }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
             onClick: copyKey,
             type: 'lmweb-icon_m_brush'
           })) : null
@@ -405,7 +435,8 @@ var EditableCell = function EditableCell(props) {
 
       case 'inputRange':
         return /*#__PURE__*/_react.default.createElement(InputRange, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
 
       case 'number':
@@ -415,7 +446,8 @@ var EditableCell = function EditableCell(props) {
           style: {
             width: (editEnum === null || editEnum === void 0 ? void 0 : editEnum.width) || '100%'
           },
-          placeholder: "\u8BF7\u8F93\u5165"
+          placeholder: "\u8BF7\u8F93\u5165",
+          ref: inputRef
         }, componentProps));
 
       case 'date':
@@ -429,7 +461,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          // ref={checkCellRef}
+          ref: inputRef,
           filterOption: function filterOption(input, option) {
             var _a, _b;
 
@@ -446,7 +478,7 @@ var EditableCell = function EditableCell(props) {
           showSearch: true,
           allowClear: true,
           placeholder: "\u8BF7\u9009\u62E9",
-          // ref={checkCellRef}
+          ref: inputRef,
           filterOption: function filterOption(input, option) {
             var _a;
 
@@ -458,23 +490,26 @@ var EditableCell = function EditableCell(props) {
 
       case 'checkbox':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
 
       case 'radio':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, Object.assign({
-          onChange: handleFormItemChange
+          onChange: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
 
       case 'switch':
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, {
+          size: 'small',
           onChange: handleFormItemChange
         });
 
       case 'upload':
         return /*#__PURE__*/_react.default.createElement(UploadSingle, {
           editEnum: componentProps,
-          // ref={checkCellRef}
+          ref: inputRef,
           onChange: handleFormItemChange
         });
 
@@ -483,7 +518,7 @@ var EditableCell = function EditableCell(props) {
         return /*#__PURE__*/_react.default.createElement(Opetate, Object.assign({
           record: record,
           rowKey: rowKey,
-          // ref={checkCellRef}
+          ref: inputRef,
           handleAdd: handleTableRowAdd,
           handleDelete: handleTableRowDelete,
           getLength: getLength
@@ -500,7 +535,8 @@ var EditableCell = function EditableCell(props) {
       default:
         return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input, Object.assign({
           onPressEnter: handleFormItemChange,
-          onBlur: handleFormItemChange
+          onBlur: handleFormItemChange,
+          ref: inputRef
         }, componentProps));
     }
   };
@@ -509,10 +545,19 @@ var EditableCell = function EditableCell(props) {
     var editable = col.editable,
         dataIndex = col.dataIndex,
         formProps = col.formProps,
-        componentProps = col.componentProps;
+        componentProps = col.componentProps,
+        hoverEdit = col.hoverEdit;
     var childNode = children;
 
-    if (isEdit && editable) {
+    if (hoverEdit && !editing) {
+      childNode = /*#__PURE__*/_react.default.createElement("div", {
+        className: "editable-cell-value-wrap",
+        style: {
+          minHeight: '22px'
+        },
+        onClick: toggleEdit
+      }, childNode);
+    } else if (isEdit && editable) {
       childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
         errorPlacement: "right",
         valuePropName: editable === 'switch' ? 'checked' : 'value',
@@ -536,9 +581,8 @@ var EditableCell = function EditableCell(props) {
     }
 
     return childNode;
-  }, [col, isEdit]); // const [childNode, setChildNode] = useState(getMemoChildNode);
-
-  var form = (0, _react.useContext)(EditableContext); // 出现死循环找我
+  }, [col, isEdit, editing]); // const [childNode, setChildNode] = useState(getMemoChildNode);
+  // 出现死循环找我
 
   (0, _react.useEffect)(function () {
     var editable = col.editable,
@@ -611,26 +655,26 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       size = _props$size === void 0 ? 'small' : _props$size,
       resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size"]);
 
-  var _useState = (0, _react.useState)([]),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      dataSource = _useState2[0],
-      setDataSource = _useState2[1]; // const [count, setCount] = useState(0);
-
-
-  var _useState3 = (0, _react.useState)({}),
+  var _useState3 = (0, _react.useState)([]),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      _valid = _useState4[0],
-      setValid = _useState4[1];
+      dataSource = _useState4[0],
+      setDataSource = _useState4[1]; // const [count, setCount] = useState(0);
 
-  var _useState5 = (0, _react.useState)([]),
+
+  var _useState5 = (0, _react.useState)({}),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      localRowSelectList = _useState6[0],
-      setLocalRowSelectList = _useState6[1];
+      _valid = _useState6[0],
+      setValid = _useState6[1];
 
   var _useState7 = (0, _react.useState)([]),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      sortEditTable = _useState8[0],
-      setCallBackFalg = _useState8[1];
+      localRowSelectList = _useState8[0],
+      setLocalRowSelectList = _useState8[1];
+
+  var _useState9 = (0, _react.useState)([]),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      sortEditTable = _useState10[0],
+      setCallBackFalg = _useState10[1];
 
   var dataSourceRef = (0, _react.useRef)([]);
   var sortDataSorceRef = (0, _react.useRef)([]);
@@ -890,10 +934,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var resultColumns = (0, _react.useMemo)(function () {
     var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
-      title: '',
+      title: '排序',
       dataIndex: 'sort',
-      width: 32,
-      maxWidth: 32,
+      width: 48,
+      maxWidth: 48,
+      className: 'drag-visible',
       render: function render(_, record) {
         return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
           id: record[_rowKey] || record.id
@@ -938,9 +983,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
       return Object.assign(Object.assign({}, col), {
         shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
+          var _a;
+
           var dataIndex = col.dataIndex;
 
-          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex)) {
+          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex) || ((_a = col.componentProps) === null || _a === void 0 ? void 0 : _a.options)) {
             return true;
           }
 
@@ -1117,8 +1164,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     style: {
       marginTop: 8
     }
-  }, /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, {
-    className: "lmweb-plus"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-plus"
   }), "\u65B0\u589E"));
 });
 

package/lib/LmEditTable/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_editTable_warpper .ant-picker {
   width: 100%;
 }
@@ -512,6 +518,9 @@ html {
   line-height: 1;
   gap: 8px;
 }
+.lm_editTable_warpper .ant-table-cell {
+  border-right: 0px !important;
+}
 .lm_editTable_warpper .ant-table-cell:empty::before {
   content: '-';
 }
@@ -547,6 +556,15 @@ html {
 .lm_editTable_warpper .ant-form-item-explain-error {
   font-size: 12px;
 }
+.lm_editTable_warpper .lm_table_quickcopy .anticon {
+  color: var(--text-color);
+}
+.lm_editTable_warpper .icon_drag {
+  color: var(--tip-text-color);
+}
+.lm_editTable_warpper .icon_drag:hover {
+  color: var(--text-color);
+}
 .lm_editTable_warpper .ant-picker {
   height: 24px !important;
   padding: 2px 8px;

package/lib/LmFilter/LmFilter.js

@@ -39,6 +39,8 @@ var LmFilter = function LmFilter(_ref, ref) {
     // 是否启用高级筛选
     enableCustom: false,
     // 是否启用自定义筛选
+    enableClear: true,
+    // 是否展示一件清空
     size: 'middle',
     // 尺寸
     searchKey: 'search',

package/lib/LmFilter/complexFilter/drawer.js

@@ -70,9 +70,7 @@ var ListItemChecked = function ListItemChecked(_ref) {
       }
 
       if (getItem.type === 'cascader') {
-        var _getItem$props;
-
-        return (0, _utils.getFlatItem)((getItem === null || getItem === void 0 ? void 0 : (_getItem$props = getItem.props) === null || _getItem$props === void 0 ? void 0 : _getItem$props.multiple) ? checkedValue : [checkedValue], getItem.data, 'parent');
+        return (0, _utils.getFlatItem)(getItem, checkedValue, 'parent');
       }
 
       return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
@@ -108,7 +106,6 @@ var ListItemChecked = function ListItemChecked(_ref) {
     e.stopPropagation();
     var filterValues = (0, _objectSpread3.default)({}, complexDrawer.data);
     delete filterValues[field];
-    console.log('filterValues', filterValues);
     dispatch({
       type: 'changeComplexDrawer',
       complexDrawer: {
@@ -334,9 +331,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
 
   var Tit = function Tit() {
     return /*#__PURE__*/_react.default.createElement("div", {
-      onClick: function onClick() {
-        console.log('title', state);
-      }
+      onClick: function onClick() {}
     }, "\u9AD8\u7EA7\u67E5\u8BE2");
   }; // 弹窗配置项
 

package/lib/LmFilter/complexFilter/valueDrawer.js

@@ -113,15 +113,14 @@ var ValueDrawer = function ValueDrawer(_ref) {
                 })
               });
               onClose();
-              _context.next = 21;
+              _context.next = 20;
               break;
 
             case 18:
               _context.prev = 18;
               _context.t0 = _context["catch"](0);
-              console.log('校验错误！', _context.t0);
 
-            case 21:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -135,8 +134,6 @@ var ValueDrawer = function ValueDrawer(_ref) {
   }();
 
   var onValuesChange = function onValuesChange(values) {
-    console.log('values', values);
-
     if (values.field) {
       form.setFieldsValue({
         value: []