@zat-design/sisyphus-react 3.11.13 → 3.11.14

package/dist/index.esm.css

@@ -1832,14 +1832,17 @@
 .pro-table.pro-table-draggable-only .ant-table-tbody .anticon {
   margin-right: 0;
 }
+.pro-table.pro-table-draggable-only .ant-table-row-expand-icon {
+  position: absolute;
+  left: -16px;
+}
 .pro-table .ant-table-cell-with-append {
   position: relative;
   z-index: 100;
   white-space: nowrap;
 }
-.pro-table .ant-table-row-expand-icon {
-  position: absolute;
-  left: -16px;
+.pro-table .ant-table-cell-with-append > div {
+  display: inline-block;
 }
 .pro-table .ant-table-content > table .ant-table-summary {
   color: var(--zaui-text, #343434);
@@ -2116,7 +2119,7 @@
   margin-left: var(--zaui-space-size-sm, 8px);
 }
 .pro-table .pro-table-empty {
-  margin: var(--zaui-space-size-lg, 32px) 0;
+  margin: 0;
   color: rgba(0, 0, 0, 0.25);
   font-size: var(--zaui-font-size-md, 14px);
   text-align: center;

package/dist/less.esm.css

@@ -1832,14 +1832,17 @@
 .pro-table.pro-table-draggable-only .ant-table-tbody .anticon {
   margin-right: 0;
 }
+.pro-table.pro-table-draggable-only .ant-table-row-expand-icon {
+  position: absolute;
+  left: -16px;
+}
 .pro-table .ant-table-cell-with-append {
   position: relative;
   z-index: 100;
   white-space: nowrap;
 }
-.pro-table .ant-table-row-expand-icon {
-  position: absolute;
-  left: -16px;
+.pro-table .ant-table-cell-with-append > div {
+  display: inline-block;
 }
 .pro-table .ant-table-content > table .ant-table-summary {
   color: var(--zaui-text, #343434);
@@ -2116,7 +2119,7 @@
   margin-left: var(--zaui-space-size-sm, 8px);
 }
 .pro-table .pro-table-empty {
-  margin: var(--zaui-space-size-lg, 32px) 0;
+  margin: 0;
   color: rgba(0, 0, 0, 0.25);
   font-size: var(--zaui-font-size-md, 14px);
   text-align: center;

package/es/ProEditTable/components/ActionButton/index.js

@@ -64,7 +64,7 @@ var ActionButton = function ActionButton(_ref) {
     mulDelete: mulDeletePoConfirmMsg
   };
   // 判断当前行是否正在编辑
-  var isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
+  var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
   // 单行删除、多行删除按钮Props
   var delBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
     disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
@@ -98,7 +98,7 @@ var ActionButton = function ActionButton(_ref) {
     });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
-  return isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
+  return _isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? _jsx(_Fragment, {
       children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? _jsx(_Popconfirm, {
         placement: "topRight",

package/es/ProEditTable/components/RenderField/index.js

@@ -64,7 +64,7 @@ var RenderField = function RenderField(_ref) {
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
-    isEditing = config.isEditing,
+    _isEditing = config._isEditing,
     form = config.form,
     setState = config.setState,
     name = config.name,
@@ -139,7 +139,7 @@ var RenderField = function RenderField(_ref) {
     // }, 100);
   }
   // 是否只读文本
-  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || getDisabled({
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
     formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
     column: column,
@@ -157,7 +157,7 @@ var RenderField = function RenderField(_ref) {
     label: label,
     labelRequired: labelRequired,
     required: !isView && _required,
-    rules: isEditing ? _rules : [],
+    rules: _isEditing ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type: type
@@ -242,7 +242,7 @@ var RenderField = function RenderField(_ref) {
     var _componentMap$type;
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : _jsx(_Fragment, {});
   }
-  if (isEditable && isEditing) {
+  if (isEditable && _isEditing) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }

package/es/ProEditTable/utils/config.js

@@ -53,9 +53,9 @@ export var actions = {
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
-      record.isEditing = true;
+      record._isEditing = true;
     } else {
-      delete record.isEditing;
+      delete record._isEditing;
     }
     // 复制当前行数据
     form.setFieldValue(virtualRowName, _objectSpread({}, record));
@@ -73,15 +73,15 @@ export var actions = {
             // 保存返回数据与当前行内数据做合并
             updateData = _typeof(result) === 'object' ? result : {};
             record = _objectSpread(_objectSpread(_objectSpread({}, record), form.getFieldValue(virtualRowName)), updateData);
-            delete record.addFlag; // 删除第一次新增的标记
+            delete record._addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
             nextEditingKeys = editingKeys.filter(function (key) {
               return key !== record.rowKey;
             }); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
-              record.isEditing = true;
+              record._isEditing = true;
             } else {
-              delete record.isEditing;
+              delete record._isEditing;
             }
             // 防止value引用不变, 值不更新 - (自定义组件)
             values = form.getFieldsValue();
@@ -114,15 +114,15 @@ export var actions = {
     });
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
-      record.isEditing = true;
+      record._isEditing = true;
     } else {
-      delete record.isEditing;
+      delete record._isEditing;
     }
     setState({
       editingKeys: nextEditingKeys
     }); // 关闭编辑状态
     // 取消分两种，一编辑取消，二添加取消
-    if (record.addFlag) {
+    if (record._addFlag) {
       onDelete({
         name: name,
         form: form,
@@ -187,8 +187,8 @@ export var actions = {
               rowKey: rowKey
             }); // 单行编辑时，需要操作一下数据结构，判断是否第一次新增，以及是否是编辑状态
             if (virtualKey) {
-              addData.addFlag = true;
-              addData.isEditing = true;
+              addData._addFlag = true;
+              addData._isEditing = true;
             }
             if (insertType === 'before') {
               nextData.unshift(addData);

package/es/ProEditTable/utils/index.js

@@ -277,7 +277,7 @@ export var transformColumns = function transformColumns() {
       item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
+      var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
       var namePath = isArray(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = getNamePath(name, virtualKey);
@@ -298,7 +298,7 @@ export var transformColumns = function transformColumns() {
           return record === null || record === void 0 ? void 0 : record[item];
         });
       }
-      if (!isEditing && ellipsis) {
+      if (!_isEditing && ellipsis) {
         return _jsx(ProTooltip, {
           text: _text,
           line: 1,
@@ -337,7 +337,7 @@ export var transformColumns = function transformColumns() {
           column: item,
           config: _objectSpread(_objectSpread({}, config), {}, {
             cellName: cellName,
-            isEditing: isEditing // 是否正在编辑
+            _isEditing: _isEditing // 是否正在编辑
           })
         })]
       });

package/es/ProTable/style/index.less

@@ -8,16 +8,20 @@
         margin-right: 0;
       }
     }
+    .@{ant-prefix}-table-row-expand-icon {
+      position: absolute;
+      left: -16px;
+    }
   }
   .@{ant-prefix}-table-cell-with-append {
     position: relative;
     z-index: 100;
     white-space: nowrap;
+    > div {
+      display: inline-block;
+    }
   }
-  .@{ant-prefix}-table-row-expand-icon {
-    position: absolute;
-    left: -16px;
-  }
+
 
   .@{ant-prefix}-table-content {
     > table {
@@ -433,7 +437,7 @@
   }
 
   .pro-table-empty {
-    margin: var(--zaui-space-size-lg, 32px) 0;
+    margin: 0;
     color: rgba(0, 0, 0, 0.25);
     font-size: var(--zaui-font-size-md, 14px);
     text-align: center;

package/es/ProTree/components/ProTreeSelect/index.js

@@ -333,15 +333,12 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     });
     if (_showEllipse) {
       title = _jsx(AdaptiveTooltip, {
-        children: treeCheckable ? titleHtml : _jsxs("span", {
+        children: treeCheckable ? titleHtml : _jsx("span", {
           className: "check-option-text",
-          children: [_jsx("span", {
+          children: _jsx("span", {
             className: "check-option-text-content",
             children: titleHtml
-          }), !disabled ? _jsx("span", {
-            className: "check-mark-icon",
-            children: _jsx(Icon, {})
-          }) : null]
+          })
         })
       });
     }

package/lib/ProEditTable/components/ActionButton/index.js

@@ -68,7 +68,7 @@ var ActionButton = function ActionButton(_ref) {
     mulDelete: mulDeletePoConfirmMsg
   };
   // 判断当前行是否正在编辑
-  var isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
+  var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
   // 单行删除、多行删除按钮Props
   var delBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
     disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
@@ -102,7 +102,7 @@ var ActionButton = function ActionButton(_ref) {
     });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
-  return isEditing && getShow(btnConfig.show) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+  return _isEditing && getShow(btnConfig.show) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
       children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
         placement: "topRight",

package/lib/ProEditTable/components/RenderField/index.js

@@ -71,7 +71,7 @@ var RenderField = function RenderField(_ref) {
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
-    isEditing = config.isEditing,
+    _isEditing = config._isEditing,
     form = config.form,
     setState = config.setState,
     name = config.name,
@@ -146,7 +146,7 @@ var RenderField = function RenderField(_ref) {
     // }, 100);
   }
   // 是否只读文本
-  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (0, _tools.getDisabled)({
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || (0, _tools.getDisabled)({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
     formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
     column: column,
@@ -164,7 +164,7 @@ var RenderField = function RenderField(_ref) {
     label: label,
     labelRequired: labelRequired,
     required: !isView && _required,
-    rules: isEditing ? _rules : [],
+    rules: _isEditing ? _rules : [],
     isSelect: (0, _utils.isSelect)({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type: type
@@ -249,7 +249,7 @@ var RenderField = function RenderField(_ref) {
     var _componentMap$type;
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   }
-  if (isEditable && isEditing) {
+  if (isEditable && _isEditing) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }

package/lib/ProEditTable/utils/config.js

@@ -59,9 +59,9 @@ var actions = exports.actions = {
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
-      record.isEditing = true;
+      record._isEditing = true;
     } else {
-      delete record.isEditing;
+      delete record._isEditing;
     }
     // 复制当前行数据
     form.setFieldValue(virtualRowName, (0, _objectSpread2.default)({}, record));
@@ -79,15 +79,15 @@ var actions = exports.actions = {
             // 保存返回数据与当前行内数据做合并
             updateData = (0, _typeof2.default)(result) === 'object' ? result : {};
             record = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, record), form.getFieldValue(virtualRowName)), updateData);
-            delete record.addFlag; // 删除第一次新增的标记
+            delete record._addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
             nextEditingKeys = editingKeys.filter(function (key) {
               return key !== record.rowKey;
             }); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
-              record.isEditing = true;
+              record._isEditing = true;
             } else {
-              delete record.isEditing;
+              delete record._isEditing;
             }
             // 防止value引用不变, 值不更新 - (自定义组件)
             values = form.getFieldsValue();
@@ -120,15 +120,15 @@ var actions = exports.actions = {
     });
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
-      record.isEditing = true;
+      record._isEditing = true;
     } else {
-      delete record.isEditing;
+      delete record._isEditing;
     }
     setState({
       editingKeys: nextEditingKeys
     }); // 关闭编辑状态
     // 取消分两种，一编辑取消，二添加取消
-    if (record.addFlag) {
+    if (record._addFlag) {
       (0, _tools.onDelete)({
         name: name,
         form: form,
@@ -193,8 +193,8 @@ var actions = exports.actions = {
               rowKey: rowKey
             }); // 单行编辑时，需要操作一下数据结构，判断是否第一次新增，以及是否是编辑状态
             if (virtualKey) {
-              addData.addFlag = true;
-              addData.isEditing = true;
+              addData._addFlag = true;
+              addData._isEditing = true;
             }
             if (insertType === 'before') {
               nextData.unshift(addData);

package/lib/ProEditTable/utils/index.js

@@ -281,7 +281,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
+      var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
@@ -302,7 +302,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           return record === null || record === void 0 ? void 0 : record[item];
         });
       }
-      if (!isEditing && ellipsis) {
+      if (!_isEditing && ellipsis) {
         return (0, _jsxRuntime.jsx)(_ProTooltip.default, {
           text: _text,
           line: 1,
@@ -341,7 +341,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           column: item,
           config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
             cellName: cellName,
-            isEditing: isEditing // 是否正在编辑
+            _isEditing: _isEditing // 是否正在编辑
           })
         })]
       });

package/lib/ProTable/style/index.less

@@ -8,16 +8,20 @@
         margin-right: 0;
       }
     }
+    .@{ant-prefix}-table-row-expand-icon {
+      position: absolute;
+      left: -16px;
+    }
   }
   .@{ant-prefix}-table-cell-with-append {
     position: relative;
     z-index: 100;
     white-space: nowrap;
+    > div {
+      display: inline-block;
+    }
   }
-  .@{ant-prefix}-table-row-expand-icon {
-    position: absolute;
-    left: -16px;
-  }
+
 
   .@{ant-prefix}-table-content {
     > table {
@@ -433,7 +437,7 @@
   }
 
   .pro-table-empty {
-    margin: var(--zaui-space-size-lg, 32px) 0;
+    margin: 0;
     color: rgba(0, 0, 0, 0.25);
     font-size: var(--zaui-font-size-md, 14px);
     text-align: center;

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -333,15 +333,12 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     });
     if (_showEllipse) {
       title = (0, _jsxRuntime.jsx)(_AdaptiveTooltip.default, {
-        children: treeCheckable ? titleHtml : (0, _jsxRuntime.jsxs)("span", {
+        children: treeCheckable ? titleHtml : (0, _jsxRuntime.jsx)("span", {
           className: "check-option-text",
-          children: [(0, _jsxRuntime.jsx)("span", {
+          children: (0, _jsxRuntime.jsx)("span", {
             className: "check-option-text-content",
             children: titleHtml
-          }), !disabled ? (0, _jsxRuntime.jsx)("span", {
-            className: "check-mark-icon",
-            children: (0, _jsxRuntime.jsx)(Icon, {})
-          }) : null]
+          })
         })
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.13",
+  "version": "3.11.14",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",