ls-pro-common 3.0.21 → 3.0.23

package/es/components/DescritionCard.js

@@ -27,23 +27,15 @@ function DescritionCard(props) {
     setCollapsed = _useState2[1];
   var titleLayout = useMemo(function () {
     if (typeof title === 'string') {
-      return /*#__PURE__*/React.createElement("div", {
-        className: 'description-card-title'
-      }, /*#__PURE__*/React.createElement("span", null, title));
-    } else {
-      return title;
+      return /*#__PURE__*/React.createElement("span", null, title);
     }
+    return title;
   }, [title]);
   var collapsedDom = useMemo(function () {
     if (!collapsible) return null;
     return /*#__PURE__*/React.createElement(UpOutlined, {
       rotate: !!collapsed ? 180 : undefined,
-      style: {
-        margin: 'auto',
-        marginLeft: '24px',
-        fontSize: '16px',
-        color: 'var(--ant-primary-color, #4997e6)'
-      },
+      className: "btn-expand",
       onClick: function onClick() {
         setCollapsed(!collapsed);
       },

package/es/components/InputTable.js

@@ -337,21 +337,6 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
     }
   }, [text, multiple]);
-  var tableOptions = {};
-  if (!multiple) {
-    tableOptions.headerTitle = "双击选中当前行数据";
-    tableOptions.rowSelection = false;
-  } else {
-    tableOptions.rowSelection = {
-      type: 'checkbox',
-      selectedRowKeys: selectedKeys,
-      preserveSelectedRowKeys: keepSelect,
-      onChange: function onChange(keys, rows) {
-        selectRowRef.current = rows;
-        setSelectedKeys(keys);
-      }
-    };
-  }
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,
@@ -382,28 +367,29 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       };
     },
     toolBarRender: function toolBarRender() {
-      return multiple ? [
-      /*#__PURE__*/
-      // <Button
-      //   className='ant-btn-gray'
-      //   key="btnClear"
-      //   onClick={() => {
-      //     tableRef.current?.clearSelected?.();
-      //     handleValue({});
-      //   }}>清空</Button>,
-      React.createElement(_Button, {
+      return multiple ? [/*#__PURE__*/React.createElement(_Button, {
         key: "btnConfirm",
         onClick: function onClick() {
           handleValue(selectRowRef.current || []);
         }
       }, "\u786E\u8BA4")] : [];
-    }
-  }, tableOptions, tableConfig, {
+    },
+    headerTitle: multiple ? null : "双击选中当前行数据",
     cardProps: {
       bodyStyle: {
         padding: 0
       }
     }
+  }, tableConfig, {
+    rowSelection: multiple ? {
+      type: 'checkbox',
+      selectedRowKeys: selectedKeys,
+      preserveSelectedRowKeys: keepSelect,
+      onChange: function onChange(keys, rows) {
+        selectRowRef.current = rows;
+        setSelectedKeys(keys);
+      }
+    } : false
   }));
   // 处理有值时，可清空
   useEffect(function () {

package/es/components/common.less

@@ -145,23 +145,7 @@ body.theme-yellow {
     justify-items: center;
     padding: 8px 20px;
     background: #fff;
-    // border-bottom: 1px solid #f0f0f0;
 
-    // .dtl-back {
-    //   display      : flex;
-    //   align-items  : center;
-    //   padding-right: 5px;
-
-    //   >span {
-    //     padding      : 3px;
-    //     border-radius: 2px;
-
-    //     &:hover {
-    //       background: var(--ant-primary-2);
-    //       color     : var(--ant-primary-color)
-    //     }
-    // }
-    // }
 
     .dtl-title {
       font-size: 16px;
@@ -323,26 +307,46 @@ a:hover {
 
 .description-card {
 
+  border: solid 1px #EAEEF2;
+
+  &.ant-pro-card {
+    box-shadow: none;
+  }
+
+  .btn-expand {
+    margin: auto;
+    margin-left: 20px;
+    font-size: 13px;
+    color: #8C8C8C;
+
+    :hover {
+      color: var(--ant-primary-color)
+    }
+  }
+
   .ant-pro-card-header {
-    height: 50px;
+    height: 38px;
+    padding: 12px;
+    background-color: #F4F7FD;
   }
 
   .ant-pro-card-body {
-    padding: 12px 24px 2px;
+    padding: 20px 12px;
   }
 
   .ant-pro-card-header-border {
-    border-bottom: 1px solid #dbeafa;
+    border-bottom: 1px solid #EAEEF2;
   }
-}
-
-.has-background {
-  background: #f6fafe;
 
   .ant-descriptions-row>td,
   .ant-descriptions-row>th {
-    padding-bottom: 10px
+    padding-bottom: 12px
   }
+
+}
+
+.has-background {
+  background: #f6fafe;
 }
 
 

package/lib/components/DescritionCard.js

@@ -35,23 +35,15 @@ function DescritionCard(props) {
     setCollapsed = _useState2[1];
   var titleLayout = (0, _react.useMemo)(function () {
     if (typeof title === 'string') {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: 'description-card-title'
-      }, /*#__PURE__*/_react.default.createElement("span", null, title));
-    } else {
-      return title;
+      return /*#__PURE__*/_react.default.createElement("span", null, title);
     }
+    return title;
   }, [title]);
   var collapsedDom = (0, _react.useMemo)(function () {
     if (!collapsible) return null;
     return /*#__PURE__*/_react.default.createElement(_icons.UpOutlined, {
       rotate: !!collapsed ? 180 : undefined,
-      style: {
-        margin: 'auto',
-        marginLeft: '24px',
-        fontSize: '16px',
-        color: 'var(--ant-primary-color, #4997e6)'
-      },
+      className: "btn-expand",
       onClick: function onClick() {
         setCollapsed(!collapsed);
       },

package/lib/components/InputTable.js

@@ -345,21 +345,6 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
     }
   }, [text, multiple]);
-  var tableOptions = {};
-  if (!multiple) {
-    tableOptions.headerTitle = "双击选中当前行数据";
-    tableOptions.rowSelection = false;
-  } else {
-    tableOptions.rowSelection = {
-      type: 'checkbox',
-      selectedRowKeys: selectedKeys,
-      preserveSelectedRowKeys: keepSelect,
-      onChange: function onChange(keys, rows) {
-        selectRowRef.current = rows;
-        setSelectedKeys(keys);
-      }
-    };
-  }
   var tableDom = /*#__PURE__*/_react.default.createElement(_lsProTable.default, (0, _extends2.default)({
     className: "ls-input-table",
     columns: columns,
@@ -390,28 +375,29 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       };
     },
     toolBarRender: function toolBarRender() {
-      return multiple ? [
-      /*#__PURE__*/
-      // <Button
-      //   className='ant-btn-gray'
-      //   key="btnClear"
-      //   onClick={() => {
-      //     tableRef.current?.clearSelected?.();
-      //     handleValue({});
-      //   }}>清空</Button>,
-      _react.default.createElement(_button.default, {
+      return multiple ? [/*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnConfirm",
         onClick: function onClick() {
           handleValue(selectRowRef.current || []);
         }
       }, "\u786E\u8BA4")] : [];
-    }
-  }, tableOptions, tableConfig, {
+    },
+    headerTitle: multiple ? null : "双击选中当前行数据",
     cardProps: {
       bodyStyle: {
         padding: 0
       }
     }
+  }, tableConfig, {
+    rowSelection: multiple ? {
+      type: 'checkbox',
+      selectedRowKeys: selectedKeys,
+      preserveSelectedRowKeys: keepSelect,
+      onChange: function onChange(keys, rows) {
+        selectRowRef.current = rows;
+        setSelectedKeys(keys);
+      }
+    } : false
   }));
   // 处理有值时，可清空
   (0, _react.useEffect)(function () {

package/lib/components/common.less

@@ -145,23 +145,7 @@ body.theme-yellow {
     justify-items: center;
     padding: 8px 20px;
     background: #fff;
-    // border-bottom: 1px solid #f0f0f0;
 
-    // .dtl-back {
-    //   display      : flex;
-    //   align-items  : center;
-    //   padding-right: 5px;
-
-    //   >span {
-    //     padding      : 3px;
-    //     border-radius: 2px;
-
-    //     &:hover {
-    //       background: var(--ant-primary-2);
-    //       color     : var(--ant-primary-color)
-    //     }
-    // }
-    // }
 
     .dtl-title {
       font-size: 16px;
@@ -323,26 +307,46 @@ a:hover {
 
 .description-card {
 
+  border: solid 1px #EAEEF2;
+
+  &.ant-pro-card {
+    box-shadow: none;
+  }
+
+  .btn-expand {
+    margin: auto;
+    margin-left: 20px;
+    font-size: 13px;
+    color: #8C8C8C;
+
+    :hover {
+      color: var(--ant-primary-color)
+    }
+  }
+
   .ant-pro-card-header {
-    height: 50px;
+    height: 38px;
+    padding: 12px;
+    background-color: #F4F7FD;
   }
 
   .ant-pro-card-body {
-    padding: 12px 24px 2px;
+    padding: 20px 12px;
   }
 
   .ant-pro-card-header-border {
-    border-bottom: 1px solid #dbeafa;
+    border-bottom: 1px solid #EAEEF2;
   }
-}
-
-.has-background {
-  background: #f6fafe;
 
   .ant-descriptions-row>td,
   .ant-descriptions-row>th {
-    padding-bottom: 10px
+    padding-bottom: 12px
   }
+
+}
+
+.has-background {
+  background: #f6fafe;
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.21",
+  "version": "3.0.23",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "^3.0.12",
+    "ls-pro-table": "^3.0.13",
     "ls-pro-form": "^3.0.6",
     "ls-pro-descriptions": "^3.0.1",
     "ls-pro-card": "^3.0.3",