@zat-design/sisyphus-react 3.13.6-beta.7 → 3.13.7-beta.1

package/es/ProAction/components/CheckModalContent/index.d.ts

@@ -0,0 +1,8 @@
+import './index.less';
+interface propsWithCheckModal {
+    errorTitle?: string;
+    list?: string[];
+    [key: string]: any;
+}
+declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
+export default CheckModalContent;

package/es/ProAction/components/CheckModalContent/index.js

@@ -0,0 +1,44 @@
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2025-02-17 11:49:02
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2025-05-28 18:23:47
+ * @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
+import './index.less';
+var CheckModalContent = function CheckModalContent(props) {
+  var _ref = props !== null && props !== void 0 ? props : {},
+    errorTitle = _ref.errorTitle,
+    _ref$list = _ref.list,
+    list = _ref$list === void 0 ? [] : _ref$list;
+  return _jsx("div", {
+    className: "pro-action-check-modal-box",
+    children: _jsxs("div", {
+      className: "res-err-list",
+      children: [_jsx("span", {
+        className: "err-tip",
+        children: errorTitle
+      }), _jsxs(_Tooltip, {
+        title: list.join('\n') || [],
+        children: [Array.isArray(list) && list.length === 1 ? _jsx("span", {
+          className: "err-item",
+          children: list[0]
+        }) : null, Array.isArray(list) && list.length > 1 ? _jsx("div", {
+          className: "list-wrap",
+          children: list.map(function (item) {
+            return _jsx("div", {
+              className: "err-item",
+              children: item
+            });
+          })
+        }) : null]
+      })]
+    })
+  });
+};
+export default CheckModalContent;

package/es/ProAction/components/CheckModalContent/index.less

@@ -0,0 +1,29 @@
+.pro-action-check-modal-box {
+  .res-err-list {
+    .err-tip {
+      color: #666;
+    }
+
+    .err-item {
+      box-sizing: border-box;
+      padding-left: 6px;
+      color: #333;
+      border-radius: 4px;
+      &:hover {
+        color: var(--zaui-brand);
+        background-color: #f0f0f0;
+      }
+    }
+
+    .list-wrap {
+      box-sizing: border-box;
+      height: 110px;
+      margin-top: 12px;
+      padding: 4px;
+      overflow-y: auto;
+      line-height: 1.8;
+      border: 1px solid #ccc;
+      border-radius: 6px;
+    }
+  }
+}

package/es/ProAction/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/popconfirm/style";
 import _Popconfirm from "antd/es/popconfirm";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -10,6 +11,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import React from 'react';
 import { useSetState } from 'ahooks';
 import { isFunction } from 'lodash';
+import CheckModalContent from './components/CheckModalContent';
 import { ProDrawerForm } from '../index';
 import locale from '../locale';
 import './index.less';
@@ -24,7 +26,8 @@ var ProAction = function ProAction(props) {
       index: 0,
       open: false,
       servicesArray: [],
-      loading: false
+      loading: false,
+      errorModalDataSource: null
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -37,12 +40,12 @@ var ProAction = function ProAction(props) {
     });
   }
   var index = state.index,
-    servicesArray = state.servicesArray;
+    errorModalDataSource = state.errorModalDataSource;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
       var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
-      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
+      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -109,14 +112,18 @@ var ProAction = function ProAction(props) {
               _context.next = 37;
               break;
             }
-            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : (_newServicesArray$cur5 = _newServicesArray$cur4.list) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.join('\n')) || [];
-            errorTitle = (_newServicesArray$cur6 = newServicesArray[currentIndex]) === null || _newServicesArray$cur6 === void 0 ? void 0 : _newServicesArray$cur6.errorTitle;
+            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
+            errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
             form.setFieldsValue({
               errorTitle: errorTitle,
               list: list
             });
             setState({
-              loading: false
+              loading: false,
+              errorModalDataSource: {
+                errorTitle: errorTitle,
+                list: list
+              }
             });
             return _context.abrupt("return");
           case 37:
@@ -164,6 +171,27 @@ var ProAction = function ProAction(props) {
       open: false
     });
   };
+  var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
+  var _ref3 = errorModalConfig || {},
+    contextRender = _ref3.contextRender;
+  var renderContent = function renderContent() {
+    var TargetComponent = _jsx(_Fragment, {});
+    if (typeof contextRender === 'function') {
+      var View = contextRender(errorModalDataSource);
+      TargetComponent = _jsx(_Fragment, {
+        children: View
+      });
+    } else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
+      TargetComponent = _jsx(_Fragment, {
+        children: contextRender
+      });
+    } else if (/*#__PURE__*/React.isValidElement(contextRender)) {
+      TargetComponent = _jsx(_Fragment, {
+        children: contextRender
+      });
+    }
+    return TargetComponent;
+  };
   return _jsxs(_Fragment, {
     children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? _jsx(_Popconfirm, {
       onConfirm: function onConfirm() {
@@ -176,8 +204,10 @@ var ProAction = function ProAction(props) {
       mode: "Modal",
       title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
       onCancel: function onCancel() {
+        form.resetFields();
         setState({
-          open: false
+          open: false,
+          errorModalDataSource: null
         });
       },
       modalProps: {
@@ -186,37 +216,7 @@ var ProAction = function ProAction(props) {
       size: "small",
       onOk: onOk,
       form: form,
-      proFormProps: {
-        span: 24,
-        isView: true,
-        columns: [{
-          type: 'Input',
-          name: 'errorTitle',
-          viewRender: function viewRender(value) {
-            var _servicesArray$index;
-            var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
-            return _jsxs("div", {
-              className: "pro-action-view-tile",
-              children: [value, list.length === 1 ? _jsxs("span", {
-                children: [" ", list[0]]
-              }) : '']
-            });
-          }
-        }, {
-          type: 'TextArea',
-          name: 'list',
-          fieldProps: {
-            autoSize: {
-              minRows: 4,
-              maxRows: 7
-            }
-          },
-          show: function show() {
-            var _servicesArray$index2, _servicesArray$index3;
-            return ((_servicesArray$index2 = servicesArray[index]) === null || _servicesArray$index2 === void 0 ? void 0 : (_servicesArray$index3 = _servicesArray$index2.list) === null || _servicesArray$index3 === void 0 ? void 0 : _servicesArray$index3.length) > 1;
-          }
-        }]
-      }
+      children: !contextRender ? _jsx(CheckModalContent, _objectSpread({}, errorModalDataSource !== null && errorModalDataSource !== void 0 ? errorModalDataSource : {})) : renderContent()
     }) : null]
   });
 };

package/es/ProAction/propsType.d.ts

@@ -1,5 +1,10 @@
 import { ReactNode } from 'react';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+/**
+ * 视图渲染函数类型
+ * @template T 记录类型
+ */
+export type contextRenderFn = (errorTitle?: string, list?: string[]) => string | number | ReactNode | void;
 export interface ProActionType {
     /**
      * @description 模式类型：check执行校验并解析错误信息展示，confirm确认提示
@@ -40,5 +45,7 @@ export interface ProActionType {
      * @default -
      */
     continue?: (previouData: any, args: any[]) => boolean;
+    /** 自定义错误弹窗内容视图渲染 */
+    contextRender?: string | number | ReactNode | contextRenderFn;
 }
 export type ProActionProps = ProActionType;

package/es/ProTable/propsType.d.ts

@@ -579,7 +579,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 用于获取和设置表单值
      * @default undefined
      */
-    form: FormInstance;
+    form?: FormInstance;
     /**
      * 重置时是否重新查询
      * @description 控制表单重置后是否自动发起查询

package/lib/ProAction/components/CheckModalContent/index.d.ts

@@ -0,0 +1,8 @@
+import './index.less';
+interface propsWithCheckModal {
+    errorTitle?: string;
+    list?: string[];
+    [key: string]: any;
+}
+declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
+export default CheckModalContent;

package/lib/ProAction/components/CheckModalContent/index.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+require("./index.less");
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2025-02-17 11:49:02
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2025-05-28 18:23:47
+ * @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
+var CheckModalContent = function CheckModalContent(props) {
+  var _ref = props !== null && props !== void 0 ? props : {},
+    errorTitle = _ref.errorTitle,
+    _ref$list = _ref.list,
+    list = _ref$list === void 0 ? [] : _ref$list;
+  return (0, _jsxRuntime.jsx)("div", {
+    className: "pro-action-check-modal-box",
+    children: (0, _jsxRuntime.jsxs)("div", {
+      className: "res-err-list",
+      children: [(0, _jsxRuntime.jsx)("span", {
+        className: "err-tip",
+        children: errorTitle
+      }), (0, _jsxRuntime.jsxs)(_antd.Tooltip, {
+        title: list.join('\n') || [],
+        children: [Array.isArray(list) && list.length === 1 ? (0, _jsxRuntime.jsx)("span", {
+          className: "err-item",
+          children: list[0]
+        }) : null, Array.isArray(list) && list.length > 1 ? (0, _jsxRuntime.jsx)("div", {
+          className: "list-wrap",
+          children: list.map(function (item) {
+            return (0, _jsxRuntime.jsx)("div", {
+              className: "err-item",
+              children: item
+            });
+          })
+        }) : null]
+      })]
+    })
+  });
+};
+var _default = exports.default = CheckModalContent;

package/lib/ProAction/components/CheckModalContent/index.less

@@ -0,0 +1,29 @@
+.pro-action-check-modal-box {
+  .res-err-list {
+    .err-tip {
+      color: #666;
+    }
+
+    .err-item {
+      box-sizing: border-box;
+      padding-left: 6px;
+      color: #333;
+      border-radius: 4px;
+      &:hover {
+        color: var(--zaui-brand);
+        background-color: #f0f0f0;
+      }
+    }
+
+    .list-wrap {
+      box-sizing: border-box;
+      height: 110px;
+      margin-top: 12px;
+      padding: 4px;
+      overflow-y: auto;
+      line-height: 1.8;
+      border: 1px solid #ccc;
+      border-radius: 6px;
+    }
+  }
+}

package/lib/ProAction/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -14,6 +15,7 @@ var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _lodash = require("lodash");
+var _CheckModalContent = _interopRequireDefault(require("./components/CheckModalContent"));
 var _index = require("../index");
 var _locale = _interopRequireDefault(require("../locale"));
 require("./index.less");
@@ -28,7 +30,8 @@ var ProAction = function ProAction(props) {
       index: 0,
       open: false,
       servicesArray: [],
-      loading: false
+      loading: false,
+      errorModalDataSource: null
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -41,12 +44,12 @@ var ProAction = function ProAction(props) {
     });
   }
   var index = state.index,
-    servicesArray = state.servicesArray;
+    errorModalDataSource = state.errorModalDataSource;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
       var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
-      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
+      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -113,14 +116,18 @@ var ProAction = function ProAction(props) {
               _context.next = 37;
               break;
             }
-            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : (_newServicesArray$cur5 = _newServicesArray$cur4.list) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.join('\n')) || [];
-            errorTitle = (_newServicesArray$cur6 = newServicesArray[currentIndex]) === null || _newServicesArray$cur6 === void 0 ? void 0 : _newServicesArray$cur6.errorTitle;
+            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
+            errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
             form.setFieldsValue({
               errorTitle: errorTitle,
               list: list
             });
             setState({
-              loading: false
+              loading: false,
+              errorModalDataSource: {
+                errorTitle: errorTitle,
+                list: list
+              }
             });
             return _context.abrupt("return");
           case 37:
@@ -168,6 +175,27 @@ var ProAction = function ProAction(props) {
       open: false
     });
   };
+  var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
+  var _ref3 = errorModalConfig || {},
+    contextRender = _ref3.contextRender;
+  var renderContent = function renderContent() {
+    var TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+    if (typeof contextRender === 'function') {
+      var View = contextRender(errorModalDataSource);
+      TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: View
+      });
+    } else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
+      TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: contextRender
+      });
+    } else if (/*#__PURE__*/_react.default.isValidElement(contextRender)) {
+      TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: contextRender
+      });
+    }
+    return TargetComponent;
+  };
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
       onConfirm: function onConfirm() {
@@ -180,8 +208,10 @@ var ProAction = function ProAction(props) {
       mode: "Modal",
       title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
       onCancel: function onCancel() {
+        form.resetFields();
         setState({
-          open: false
+          open: false,
+          errorModalDataSource: null
         });
       },
       modalProps: {
@@ -190,37 +220,7 @@ var ProAction = function ProAction(props) {
       size: "small",
       onOk: onOk,
       form: form,
-      proFormProps: {
-        span: 24,
-        isView: true,
-        columns: [{
-          type: 'Input',
-          name: 'errorTitle',
-          viewRender: function viewRender(value) {
-            var _servicesArray$index;
-            var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
-            return (0, _jsxRuntime.jsxs)("div", {
-              className: "pro-action-view-tile",
-              children: [value, list.length === 1 ? (0, _jsxRuntime.jsxs)("span", {
-                children: [" ", list[0]]
-              }) : '']
-            });
-          }
-        }, {
-          type: 'TextArea',
-          name: 'list',
-          fieldProps: {
-            autoSize: {
-              minRows: 4,
-              maxRows: 7
-            }
-          },
-          show: function show() {
-            var _servicesArray$index2, _servicesArray$index3;
-            return ((_servicesArray$index2 = servicesArray[index]) === null || _servicesArray$index2 === void 0 ? void 0 : (_servicesArray$index3 = _servicesArray$index2.list) === null || _servicesArray$index3 === void 0 ? void 0 : _servicesArray$index3.length) > 1;
-          }
-        }]
-      }
+      children: !contextRender ? (0, _jsxRuntime.jsx)(_CheckModalContent.default, (0, _objectSpread2.default)({}, errorModalDataSource !== null && errorModalDataSource !== void 0 ? errorModalDataSource : {})) : renderContent()
     }) : null]
   });
 };

package/lib/ProAction/propsType.d.ts

@@ -1,5 +1,10 @@
 import { ReactNode } from 'react';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+/**
+ * 视图渲染函数类型
+ * @template T 记录类型
+ */
+export type contextRenderFn = (errorTitle?: string, list?: string[]) => string | number | ReactNode | void;
 export interface ProActionType {
     /**
      * @description 模式类型：check执行校验并解析错误信息展示，confirm确认提示
@@ -40,5 +45,7 @@ export interface ProActionType {
      * @default -
      */
     continue?: (previouData: any, args: any[]) => boolean;
+    /** 自定义错误弹窗内容视图渲染 */
+    contextRender?: string | number | ReactNode | contextRenderFn;
 }
 export type ProActionProps = ProActionType;

package/lib/ProTable/propsType.d.ts

@@ -579,7 +579,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 用于获取和设置表单值
      * @default undefined
      */
-    form: FormInstance;
+    form?: FormInstance;
     /**
      * 重置时是否重新查询
      * @description 控制表单重置后是否自动发起查询

package/package.json

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