linkmore-design 1.0.12 → 1.0.13

package/lib/LeftTable/style/style.css

@@ -498,7 +498,7 @@ html {
   font-size: 12px;
   height: calc(100% - 36px);
   width: 168px;
-  border: 1px solid #eee;
+  border: 1px solid var(--line-color);
 }
 .lm_grid_tree .grid_tree_title {
   display: flex;
@@ -510,15 +510,31 @@ html {
   transition: 0.3s;
   overflow: hidden;
 }
-.lm_grid_tree .grid_tree_title .grid_tree_title_left,
-.lm_grid_tree .grid_tree_title .grid_tree_title_right {
+.lm_grid_tree .grid_tree_title .grid_tree_title_left {
   white-space: nowrap;
-  padding: 0 6px 0 16px;
+  padding: 0 6px 0 8px;
+}
+.lm_grid_tree .grid_tree_title .grid_tree_title_left > button {
+  display: flex;
+  justify-content: flex-end;
+}
+.lm_grid_tree .grid_tree_title .grid_tree_title_right button {
+  width: 24px;
+  height: 24px;
+  margin-right: 8px;
+  padding: 0;
+  cursor: pointer;
+}
+.lm_grid_tree .grid_tree_title .grid_tree_title_right button :hover {
+  color: var(--primary-color);
+}
+.lm_grid_tree .grid_tree_title .grid_tree_title_right.ant-popover-open button {
+  color: var(--primary-color);
 }
 .lm_grid_tree .ant-tree {
   font-size: 12px;
   white-space: nowrap;
-  padding: 0 10px;
+  padding: 0px;
   transition: 0.3s;
 }
 .lm_grid_tree .ant-tree .ant-tree-list-holder-inner > :first-child .ant-tree-switcher:empty {
@@ -543,17 +559,19 @@ html {
   z-index: 1;
   top: 50%;
   transform: translateY(-50%);
-  right: -6px;
+  right: 0;
   display: flex;
   font-size: 8px;
   width: 12px;
   height: 48px;
   align-items: center;
   justify-content: center;
-  border-radius: 12px;
-  color: var(--font-color);
-  background-color: var(--table-background-color);
-  transition: 0.3s;
+  border-radius: 0;
+  color: var(--text-color);
+  background-color: var(--line-color);
+  transition: 0s;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
   cursor: pointer;
 }
 .lm_grid_tree .toggle_btn:hover {
@@ -575,3 +593,13 @@ html {
   right: -14px;
   transform: translateY(-50%) rotateY(180deg);
 }
+.lm_tree_warp .ant-tree-list-holder-inner .ant-tree-treenode {
+  width: 100%;
+  display: flex;
+}
+.lm_tree_warp .ant-tree-list-holder-inner .ant-tree-treenode > .ant-tree-node-content-wrapper {
+  flex: 1 1 auto;
+}
+.lm_tree_warp .ant-tree-list-holder-inner .ant-tree-treenode > .ant-tree-node-content-wrapper.ant-tree-node-selected {
+  background-color: var(--primary-select-color);
+}

package/lib/Modal/index.js

@@ -46,16 +46,20 @@ var CLMModal = function CLMModal(props) {
 
   return /*#__PURE__*/_react.default.createElement(_modal.default, Object.assign({
     wrapClassName: (0, _classnames.default)(wrapClassName, prefixCls),
-    width: size === 'default' ? 552 : 416
-  }, other, {
+    width: size === 'default' ? 552 : 416,
     footer: [/*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       onClick: onCancel,
       size: 'middle'
-    }, cancelText || '取消'), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    }, cancelText), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onOk,
       size: 'middle'
     }, okText)]
+  }, other, {
+    onOk: onOk,
+    onCancel: onCancel,
+    okText: okText,
+    cancelText: cancelText
   }));
 };
 

package/lib/PopTable/style/style.css

@@ -530,7 +530,6 @@ html {
 .lm_popover_table .lm_operate .operate_left,
 .lm_popover_table .lm_operate .operate_right {
   display: flex;
-  padding-bottom: calc(var(--gap) * 2);
 }
 .lm_popover_table .lm_operate .operate_left:empty,
 .lm_popover_table .lm_operate .operate_right:empty {

package/lib/ProTable/ImgList/body.js

@@ -17,14 +17,14 @@ var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualiz
 
 var _reactWindow = require("react-window");
 
-var _context = _interopRequireDefault(require("./context"));
-
-var _imgCell = _interopRequireDefault(require("./imgCell"));
-
 var _cardCell = _interopRequireDefault(require("./cardCell"));
 
+var _context = _interopRequireDefault(require("./context"));
+
 var _empty = _interopRequireDefault(require("./empty"));
 
+var _imgCell = _interopRequireDefault(require("./imgCell"));
+
 var ImgList = function ImgList(props) {
   var widthCount = props.width,
       heightCount = props.height;
@@ -40,7 +40,7 @@ var ImgList = function ImgList(props) {
 
 
   var columnCount = (0, _react.useMemo)(function () {
-    return widthCount > 1800 ? 5 : widthCount > 1500 ? 4 : 3;
+    return widthCount > 1800 ? 7 : widthCount > 1400 ? 6 : widthCount > 1000 ? 5 : 4;
   }, [widthCount]);
   var widthCell = (0, _react.useMemo)(function () {
     return (widthCount - 8) / columnCount;

package/lib/ProTable/Table.js

@@ -19,14 +19,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualized-auto-sizer"));
-
 var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
 
 var _lodash = require("lodash");
 
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualized-auto-sizer"));
+
 var _context = _interopRequireDefault(require("./context"));
 
 var _VList = require("./VList");
@@ -273,6 +273,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     loading: loading,
     dataSource: dataSource,
     components: vComponents,
+    tableClassName: "lm_protable",
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);
     }

package/lib/ProTable/style/style.css

@@ -578,7 +578,6 @@ html {
 .lm_operate .operate_left,
 .lm_operate .operate_right {
   display: flex;
-  padding-bottom: calc(var(--gap) * 2);
 }
 .lm_operate .operate_left:empty,
 .lm_operate .operate_right:empty {
@@ -817,7 +816,7 @@ html {
   height: 100%;
   border-radius: 2px;
   background-color: var(--background-color);
-  padding: 8px;
+  padding: 16px 8px 8px 8px;
   overflow: hidden;
   border: 1px solid transparent;
   transition: 0.3s;
@@ -880,9 +879,11 @@ html {
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  font-weight: 500;
 }
 .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_title .code {
   padding-top: 5px;
+  color: var(--text-color);
 }
 .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_title .code .ant-typography {
   color: var(--text-color);
@@ -902,6 +903,8 @@ html {
   justify-content: flex-start;
   align-items: center;
   flex-wrap: wrap;
+  font-size: 12px;
+  padding-left: 4px;
 }
 .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_tags button.ant-btn-sm {
   border: 0;
@@ -970,6 +973,9 @@ html {
   background: var(--background-color);
   padding: 0 8px;
 }
+.lm_img_table .lm_card_cell_content .card_cell_body .card_cell_info .code {
+  font-size: 12px;
+}
 .lm_img_table .lm_card_cell_content .card_cell_body .card_cell_info .code .ant-typography {
   color: var(--text-color);
   text-shadow: 0px 2px 8px rgba(0, 0, 0, 0.08);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"