@zat-design/sisyphus-react 3.8.3-beta.3 → 3.8.3-beta.5

package/es/ProEditTable/index.js

@@ -89,7 +89,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
   }, [themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign]);
   var _useSetState = useSetState({
-      _columns: columns,
       cellNamePath: [],
       forceUpdate: {},
       editingKeys: [],

package/es/ProEditTable/propsType.d.ts

@@ -109,7 +109,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
 export interface State {
-    _columns: ProEditTableColumnsProps[];
     cellNamePath: NamePath[];
     forceUpdate: {};
     editingKeys: string[];

package/es/ProEditTable/utils/index.js

@@ -335,14 +335,21 @@ export var transformColumns = function transformColumns() {
         });
       }
       // 单行多行交互有较大差异
-      return _jsx("div", {
+      return _jsxs("div", {
         className: cellClassName,
         onClick: function onClick() {
           isCanEdit && setState({
             cellNamePath: cellName
           });
         },
-        children: _jsx(RenderField, {
+        children: [index === 0 && !item.width ? _jsx("div", {
+          style: {
+            visibility: 'hidden',
+            height: 0,
+            paddingLeft: (item === null || item === void 0 ? void 0 : item.required) ? 16 : 0
+          },
+          children: columnTitle
+        }) : null, _jsx(RenderField, {
           text: _text,
           record: record,
           index: index,
@@ -351,7 +358,7 @@ export var transformColumns = function transformColumns() {
             cellName: cellName,
             isEditing: isEditing // 是否正在编辑
           })
-        })
+        })]
       });
     };
     item.render = _render;

package/es/ProForm/components/render/ChangedWrapper.js

@@ -54,7 +54,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
     if (!isWatch || noChange) return undefined;
-    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
+    var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
+      value: originalValue
+    };
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
       isView: true
     }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;

package/es/ProTable/components/FormatColumn/index.js

@@ -384,17 +384,25 @@ export var formatColumn = function formatColumn(_ref2) {
         code: code,
         value: originalRealValue
       });
-      return _jsx(ProForm.ProCascader, {
+      var renderNode = _jsx(ProForm.ProCascader, {
         className: className,
         isView: true,
         mode: "address",
         code: code,
         value: realValue,
-        tooltip: originalValue !== undefined ? _jsxs(_Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, _jsx("br", {}), ellipsis ? _jsxs(_Fragment, {
-            children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
-          }) : undefined]
-        }) : ellipsis
+        tooltip: false
+      });
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: originalRealValue === undefined ? undefined : originalRenderValue,
+        ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
+        width: width,
+        node: renderNode,
+        value: value,
+        currentValue: renderValue,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (copyable) {

package/es/ProTable/components/RenderColumn/index.js

@@ -4,7 +4,7 @@ import _Tooltip from "antd/es/tooltip";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
@@ -53,7 +53,9 @@ var RenderColumn = function RenderColumn(props) {
           minWidth: minWidth
         },
         title: originalDiffTip ? _jsxs(_Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
+          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? _jsxs("span", {
+            children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
+          }) : undefined]
         }) : node,
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;

package/lib/ProEditTable/index.js

@@ -92,7 +92,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
   }, [themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign]);
   var _useSetState = (0, _ahooks.useSetState)({
-      _columns: columns,
       cellNamePath: [],
       forceUpdate: {},
       editingKeys: [],

package/lib/ProEditTable/propsType.d.ts

@@ -109,7 +109,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
 export interface State {
-    _columns: ProEditTableColumnsProps[];
     cellNamePath: NamePath[];
     forceUpdate: {};
     editingKeys: string[];

package/lib/ProEditTable/utils/index.js

@@ -339,14 +339,21 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         });
       }
       // 单行多行交互有较大差异
-      return (0, _jsxRuntime.jsx)("div", {
+      return (0, _jsxRuntime.jsxs)("div", {
         className: cellClassName,
         onClick: function onClick() {
           isCanEdit && setState({
             cellNamePath: cellName
           });
         },
-        children: (0, _jsxRuntime.jsx)(_components.RenderField, {
+        children: [index === 0 && !item.width ? (0, _jsxRuntime.jsx)("div", {
+          style: {
+            visibility: 'hidden',
+            height: 0,
+            paddingLeft: (item === null || item === void 0 ? void 0 : item.required) ? 16 : 0
+          },
+          children: columnTitle
+        }) : null, (0, _jsxRuntime.jsx)(_components.RenderField, {
           text: _text,
           record: record,
           index: index,
@@ -355,7 +362,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
             cellName: cellName,
             isEditing: isEditing // 是否正在编辑
           })
-        })
+        })]
       });
     };
     item.render = _render;

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -59,7 +59,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
-    var valueProps = getValueProps ? getValueProps(originalValue) : originalValue;
+    var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
+      value: originalValue
+    };
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
       isView: true
     }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;

package/lib/ProTable/components/FormatColumn/index.js

@@ -390,17 +390,25 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         code: code,
         value: originalRealValue
       });
-      return (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      var renderNode = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
         className: className,
         isView: true,
         mode: "address",
         code: code,
         value: realValue,
-        tooltip: originalValue !== undefined ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
-          }) : undefined]
-        }) : ellipsis
+        tooltip: false
+      });
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        valueType: valueType,
+        originalValue: originalRealValue === undefined ? undefined : originalRenderValue,
+        ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
+        width: width,
+        node: renderNode,
+        value: value,
+        currentValue: renderValue,
+        originalDiffTip: _originalDiffTip,
+        toolTipProps: _toolTipProps,
+        minWidth: minWidth
       });
     };
   } else if (copyable) {

package/lib/ProTable/components/RenderColumn/index.js

@@ -57,7 +57,9 @@ var RenderColumn = function RenderColumn(props) {
           minWidth: minWidth
         },
         title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
+          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)("span", {
+            children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
+          }) : undefined]
         }) : node,
         getPopupContainer: function getPopupContainer(triggerNode) {
           return triggerNode.parentNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.8.3-beta.3",
+  "version": "3.8.3-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}