@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

package/lib/ProDrawerForm/propsType.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import type { ModalProps, DrawerProps, FormInstance } from 'antd';
+import type { ModalProps, DrawerProps, FormInstance, ModalFuncProps } from 'antd';
 import type { ProFormType } from '../ProForm/propsType';
 /**
  * 抽屉尺寸类型定义
@@ -11,17 +11,11 @@ export type DrawerSizeType = DrawerSizePropsType;
  */
 export type ShowTypePropsType = 'Modal' | 'Drawer';
 export type ShowType = ShowTypePropsType;
-/**
- * 为了保持向后兼容，保留原有接口名称
- * @deprecated ProDrawerFormType
- */
-export interface ProDrawerFormPropsType {
+export interface ProDrawerFormType {
     /** @name 内部form实例 */
     form?: FormInstance<any>;
     /** @name 自定义className */
     className?: string;
-    /** @name 控制显示隐藏（兼容旧版API） */
-    visible?: ModalProps['open'] | DrawerProps['open'];
     /** @name 控制显示隐藏 */
     open: ModalProps['open'] | DrawerProps['open'];
     /** @name 标题 */
@@ -33,7 +27,7 @@ export interface ProDrawerFormPropsType {
     /** @name 是否查看模式 */
     isView?: boolean | undefined;
     /** @name 宽度 */
-    width?: ModalProps['width'] | DrawerProps['width'];
+    width?: string | number;
     /** @name 取消按钮文字 */
     cancelText?: ModalProps['cancelText'];
     /** @name 确认按钮文字 */
@@ -62,7 +56,7 @@ export interface ProDrawerFormPropsType {
      * @name 关闭时二次确认弹框的属性
      * @description 只对Drawer的类型有效
      */
-    isConfirmCloseModalProps?: ModalProps;
+    isConfirmCloseModalProps?: Omit<ModalFuncProps, 'content' | 'onOk' | 'onCancel'>;
     /**
      * @name 底部默认取消按钮事件
      * @returns 返回Promise或布尔值可控制弹窗关闭行为
@@ -90,14 +84,12 @@ export interface ProDrawerFormPropsType {
     proFormProps?: Omit<ProFormType, 'form'>;
     /**
      * @name 弹框的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    modalProps?: Omit<ModalProps, 'visible'>;
+    modalProps?: ModalProps;
     /**
      * @name 抽屉的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    drawerProps?: Omit<DrawerProps, 'visible'>;
+    drawerProps?: DrawerProps;
     /**
      * @name 关闭时弹框或者抽屉是否清空formValues
      */
@@ -107,7 +99,4 @@ export interface ProDrawerFormPropsType {
     /** @name z轴层级 */
     zIndex?: number;
 }
-/**
- * 抽屉表单属性类型定义
- */
-export type ProDrawerFormType = ProDrawerFormPropsType;
+export type ProDrawerFormPropsType = ProDrawerFormType;

package/lib/ProDrawerForm/propsType.js

@@ -1,5 +1,17 @@
-"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+// src/ProDrawerForm/propsType.ts
+var propsType_exports = {};
+module.exports = __toCommonJS(propsType_exports);

package/lib/ProDrawerForm/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-drawer {
   .original-value-tooltip {
@@ -112,18 +112,13 @@
 .pro-modal {
   .@{ant-prefix}-modal-close {
     .@{ant-prefix}-modal-close-x {
-      .close-icon {
-        fill: var(--zaui-aide-text, #909090);
-
-        &:hover {
-          fill: var(--zaui-brand, #006aff);
-        }
-      }
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
 
   .@{ant-prefix}-modal-header {
-    padding: var(--zaui-space-size-md, 16px);
     border-bottom: none;
 
     .@{ant-prefix}-modal-title {
@@ -132,11 +127,11 @@
   }
 
   .@{ant-prefix}-modal-footer {
-    padding: var(--zaui-space-size-md, 16px);
     border-top: none;
 
     .pro-modal-footer {
       display: flex;
+      align-items: center;
       justify-content: space-between;
     }
   }
@@ -144,9 +139,9 @@
   .@{ant-prefix}-modal-content {
     .@{ant-prefix}-modal-body {
       max-height: 450px;
-      padding: 0 var(--zaui-space-size-md, 16px);
       padding-top: 0;
-      overflow: auto;
+      overflow-x: hidden;
+      overflow-y: auto;
     }
   }
 }
@@ -173,6 +168,5 @@
   .@{ant-prefix}-modal-footer {
     position: relative;
     z-index: 1;
-    box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
 }

package/lib/ProDrawerForm/utils/index.js

@@ -1,22 +1,40 @@
-"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProDrawerForm/utils/index.ts
+var utils_exports = {};
+__export(utils_exports, {
+  transformBySize: () => transformBySize
 });
-exports.transformBySize = void 0;
-/**
- * 将枚举值转成数值px，暴露枚举，隐藏真实数值，暂时不让用户自定义
- * @param size 设计规范的三个尺寸  460 960 1200 对应 'small' | 'middle' | 'large'
- */
-var transformBySize = exports.transformBySize = function transformBySize(size) {
+module.exports = __toCommonJS(utils_exports);
+var transformBySize = (size) => {
   switch (size) {
-    case 'small':
+    case "small":
       return 460;
-    case 'middle':
+    case "middle":
       return 960;
-    case 'large':
+    case "large":
       return 1200;
     default:
       return 960;
   }
-};
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  transformBySize
+});

package/lib/ProEditLabel/components/RenderProForm.js

@@ -1,83 +1,84 @@
-"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProEditLabel/components/RenderProForm.tsx
+var RenderProForm_exports = {};
+__export(RenderProForm_exports, {
+  default: () => RenderProForm_default
 });
-exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = require("react");
-var _icons = require("@ant-design/icons");
-var _index = require("../../index");
-var _utils = require("../utils");
-var RenderProForm = function RenderProForm(props) {
-  var _props3, _props6, _props7;
-  var columns = [];
-  var primitiveProps = (0, _objectSpread2.default)({}, props);
-  var _props = {};
-  (0, _react.useEffect)(function () {
-    // isNode以ReactNode节点方式打开popUp，默认每次打开弹窗清空弹窗内容
-    if ((primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.value) && !(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.isNode)) {
-      var _props2;
-      _props.form.setFieldsValue((0, _utils.matchFormValue)(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.value, (_props2 = _props) === null || _props2 === void 0 ? void 0 : _props2.columns));
+module.exports = __toCommonJS(RenderProForm_exports);
+var import_react = require("react");
+var import_lodash = require("lodash");
+var import_icons = require("@ant-design/icons");
+var import_antd = require("antd");
+var import__ = require("../../index");
+var import_utils = require("../utils");
+var RenderProForm = (props) => {
+  var _a, _b;
+  const columns = [];
+  const primitiveProps = { ...props };
+  let _props = {};
+  (0, import_react.useEffect)(() => {
+    if ((primitiveProps == null ? void 0 : primitiveProps.value) && !(primitiveProps == null ? void 0 : primitiveProps.isNode)) {
+      _props.form.setFieldsValue((0, import_utils.matchFormValue)(primitiveProps == null ? void 0 : primitiveProps.value, _props == null ? void 0 : _props.columns));
     }
-    // 销毁重置表单数据
-    return function () {
-      var _props$form;
-      (_props$form = _props.form) === null || _props$form === void 0 ? void 0 : _props$form.resetFields();
+    return () => {
+      var _a2;
+      (_a2 = _props.form) == null ? void 0 : _a2.resetFields();
     };
   }, []);
-  // 兼容老写法
   if (!props.columns) {
-    columns[0] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode'])), {}, {
-      name: props.type || 'Input'
-    });
+    columns[0] = {
+      ...(0, import_lodash.omit)(props, ["title", "tip", "form", "onChange", "isView", "isNode"]),
+      name: props.type || "Input"
+    };
     _props = {
-      columns: columns,
+      columns,
       form: props.form,
       isView: props.isView
     };
   } else {
-    _props = (0, _objectSpread2.default)({}, (0, _omit2.default)(props, ['onChange', 'isNode']));
+    _props = { ...(0, import_lodash.omit)(props, ["onChange", "isNode"]) };
   }
-  if ((_props3 = _props) === null || _props3 === void 0 ? void 0 : _props3.isView) {
-    var _props4, _props4$columns;
-    (_props4 = _props) === null || _props4 === void 0 ? void 0 : (_props4$columns = _props4.columns) === null || _props4$columns === void 0 ? void 0 : _props4$columns.forEach(function (item) {
+  if (_props == null ? void 0 : _props.isView) {
+    (_a = _props == null ? void 0 : _props.columns) == null ? void 0 : _a.forEach((item) => {
       item.noStyle = true;
     });
   } else {
-    var _props5, _props5$columns;
-    (_props5 = _props) === null || _props5 === void 0 ? void 0 : (_props5$columns = _props5.columns) === null || _props5$columns === void 0 ? void 0 : _props5$columns.forEach(function (item) {
+    (_b = _props == null ? void 0 : _props.columns) == null ? void 0 : _b.forEach((item) => {
       item.noStyle = false;
     });
   }
-  return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title) && !((_props6 = _props) === null || _props6 === void 0 ? void 0 : _props6.isView) && (0, _jsxRuntime.jsx)("div", {
-      className: "pro-edit-label-title",
-      children: primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title
-    }), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) === null || _props7 === void 0 ? void 0 : _props7.isView) && (0, _jsxRuntime.jsx)("div", {
-      className: "pro-edit-label-tip",
-      children: (0, _jsxRuntime.jsxs)(_space.default, {
-        align: "start",
-        children: [(0, _jsxRuntime.jsx)(_icons.InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
-      })
-    }), (0, _jsxRuntime.jsx)(_index.ProForm, (0, _objectSpread2.default)({
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, (primitiveProps == null ? void 0 : primitiveProps.title) && !(_props == null ? void 0 : _props.isView) && /* @__PURE__ */ React.createElement("div", { className: "pro-edit-label-title" }, primitiveProps == null ? void 0 : primitiveProps.title), (primitiveProps == null ? void 0 : primitiveProps.tip) && !(_props == null ? void 0 : _props.isView) && /* @__PURE__ */ React.createElement("div", { className: "pro-edit-label-tip" }, /* @__PURE__ */ React.createElement(import_antd.Space, { align: "start" }, /* @__PURE__ */ React.createElement(import_icons.InfoCircleOutlined, null), primitiveProps == null ? void 0 : primitiveProps.tip)), /* @__PURE__ */ React.createElement(
+    import__.ProForm,
+    {
       span: 24,
       footer: false,
-      onValuesChange: function onValuesChange(changeValue, values) {
-        var _props8;
-        if (((_props8 = _props) === null || _props8 === void 0 ? void 0 : _props8.columns.length) === 1) {
-          var _props9, _props9$columns$;
-          primitiveProps.onChange && primitiveProps.onChange(values[(_props9 = _props) === null || _props9 === void 0 ? void 0 : (_props9$columns$ = _props9.columns[0]) === null || _props9$columns$ === void 0 ? void 0 : _props9$columns$.name]);
+      onValuesChange: (changeValue, values) => {
+        var _a2;
+        if ((_props == null ? void 0 : _props.columns.length) === 1) {
+          primitiveProps.onChange && primitiveProps.onChange(values[(_a2 = _props == null ? void 0 : _props.columns[0]) == null ? void 0 : _a2.name]);
           return;
         }
         primitiveProps.onChange && primitiveProps.onChange(values);
-      }
-    }, _props))]
-  });
+      },
+      ..._props
+    }
+  ));
 };
-var _default = exports.default = RenderProForm;
+var RenderProForm_default = RenderProForm;