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

package/lib/ProForm/style/index.less

@@ -1,6 +1,7 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../components/base/SwitchCheckbox/style/index.less';
+@import '../components/base/TimePicker/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
@@ -9,8 +10,6 @@
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';
 @import '../components/combination/Container/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
   &.@{ant-prefix}-form-vertical {
@@ -106,7 +105,6 @@
   }
 
   .@{ant-prefix}-form-item {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
@@ -137,13 +135,6 @@
       display: none;
     }
 
-    .@{ant-prefix}-form-item-explain {
-      height: auto;
-
-      .@{ant-prefix}-form-item-explain-error {
-        font-size: var(--zaui-font-size, 14px);
-      }
-    }
 
     .@{ant-prefix}-input-number {
       width: 100%;
@@ -186,8 +177,8 @@
 
   .@{ant-prefix}-form-item-has-error {
     .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
 
     .site-input-split {
@@ -318,8 +309,7 @@
     width: 18px;
   }
   .pro-form-list-tool-btn {
-    margin-left: 8px;
-    padding: 0;
+    padding: 0 4px;
     cursor: pointer;
     .anticon {
       color: var(--zaui-text-weak, #a0a0a0);

package/lib/ProForm/utils/diffOriginal.js

@@ -1,24 +1,36 @@
-"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/ProForm/utils/diffOriginal.ts
+var diffOriginal_exports = {};
+__export(diffOriginal_exports, {
+  diffOriginal: () => diffOriginal
 });
-exports.diffOriginal = void 0;
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _utils = require("../../utils");
-// 过滤对象中undefined字段
-// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
-var filterObject = function filterObject(data) {
-  if (!(0, _isObject2.default)(data) || data === null) return data;
-  // ['1', undefined] ['1', ''] 视为相等
+module.exports = __toCommonJS(diffOriginal_exports);
+var import_lodash = require("lodash");
+var import_utils = require("../../utils");
+var filterObject = (data) => {
+  if (!(0, import_lodash.isObject)(data) || data === null)
+    return data;
   if (Array.isArray(data)) {
-    // 数组中全是empty值的话 视为null
-    var isFillNull = true;
-    var arr = data.map(function (item) {
-      if ((0, _utils.isEmpty)(item)) {
+    let isFillNull = true;
+    const arr = data.map((item) => {
+      if ((0, import_utils.isEmpty)(item)) {
         return null;
       }
       isFillNull = false;
@@ -26,38 +38,38 @@ var filterObject = function filterObject(data) {
     });
     return isFillNull ? null : arr;
   }
-  var resData = {};
-  Object.keys(data).forEach(function (key) {
-    if (!(0, _utils.isEmpty)(data[key])) {
+  const resData = {};
+  Object.keys(data).forEach((key) => {
+    if (!(0, import_utils.isEmpty)(data[key])) {
       resData[key] = data[key];
     }
   });
-  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
-  if (!Object.keys(resData).length) return null;
+  if (!Object.keys(resData).length)
+    return null;
   return resData;
 };
-var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
-  var originalValue = params.originalValue,
-    value = params.value,
-    onDiff = params.onDiff;
-  // 支持传入自定义比较事件
-  if ((0, _isFunction2.default)(onDiff)) {
-    var diffRes = onDiff(originalValue, value);
-    // 如果返回undefined走内置比较逻辑
-    if (diffRes !== undefined) {
-      if (typeof diffRes === 'boolean') {
-        return diffRes ? 'same' : 'changed';
+var diffOriginal = (params) => {
+  const { originalValue, value, onDiff } = params;
+  if ((0, import_lodash.isFunction)(onDiff)) {
+    const diffRes = onDiff(originalValue, value);
+    if (diffRes !== void 0) {
+      if (typeof diffRes === "boolean") {
+        return diffRes ? "same" : "changed";
       }
       return diffRes;
     }
   }
-  var _value = filterObject(value);
-  var _originalValue = filterObject(originalValue);
-  var isEmptyVal = (0, _utils.isEmpty)(_value);
-  var isEmptyOrg = (0, _utils.isEmpty)(_originalValue);
-  // 都为空视为相等
-  if (isEmptyOrg && isEmptyVal) return 'same';
-  // 如果原始值为空 且当前有值的话 视为新增
-  if (isEmptyOrg && !isEmptyVal) return 'add';
-  return (0, _isEqual2.default)(_value, _originalValue) ? 'same' : 'changed';
-};
+  const _value = filterObject(value);
+  const _originalValue = filterObject(originalValue);
+  const isEmptyVal = (0, import_utils.isEmpty)(_value);
+  const isEmptyOrg = (0, import_utils.isEmpty)(_originalValue);
+  if (isEmptyOrg && isEmptyVal)
+    return "same";
+  if (isEmptyOrg && !isEmptyVal)
+    return "add";
+  return (0, import_lodash.isEqual)(_value, _originalValue) ? "same" : "changed";
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  diffOriginal
+});

package/lib/ProForm/utils/getDefaultProps.js

@@ -1,39 +1,55 @@
-"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/ProForm/utils/getDefaultProps.ts
+var getDefaultProps_exports = {};
+__export(getDefaultProps_exports, {
+  getDefaultProps: () => getDefaultProps
 });
-exports.getDefaultProps = void 0;
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
+module.exports = __toCommonJS(getDefaultProps_exports);
+var import_lodash = require("lodash");
 var defaultPropsMap = {
-  ProSelect: function ProSelect(props) {
-    var fieldProps = props.fieldProps,
-      name = props.name,
-      namePath = props.namePath;
-    var _ref = fieldProps || {},
-      filterInList = _ref.filterInList;
-    var defaultProps = {};
-    // formList场景传入列表过滤时
+  ProSelect: (props) => {
+    const { fieldProps, name, namePath } = props;
+    const { filterInList } = fieldProps || {};
+    const defaultProps = {};
     if (filterInList && namePath && name) {
-      var _listName = namePath.slice(0, -1);
-      var _namePath = name.slice(1);
-      defaultProps.shouldUpdate = function (preValues, curValues) {
-        var preListValue = (0, _get2.default)(preValues, _listName).map(function (item) {
-          return (0, _get2.default)(item, _namePath);
+      const _listName = namePath.slice(0, -1);
+      const _namePath = name.slice(1);
+      defaultProps.shouldUpdate = (preValues, curValues) => {
+        const preListValue = (0, import_lodash.get)(preValues, _listName).map((item) => {
+          return (0, import_lodash.get)(item, _namePath);
         });
-        var curListValue = (0, _get2.default)(curValues, _listName).map(function (item) {
-          return (0, _get2.default)(item, _namePath);
+        const curListValue = (0, import_lodash.get)(curValues, _listName).map((item) => {
+          return (0, import_lodash.get)(item, _namePath);
         });
-        return !(0, _isEqual2.default)(preListValue, curListValue);
+        return !(0, import_lodash.isEqual)(preListValue, curListValue);
       };
     }
     return defaultProps;
   }
 };
-var getDefaultProps = exports.getDefaultProps = function getDefaultProps(props) {
-  var _defaultPropsMap$type;
-  var type = props.type;
-  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
-};
+var getDefaultProps = (props) => {
+  var _a;
+  const { type } = props;
+  return (_a = defaultPropsMap[type]) == null ? void 0 : _a.call(defaultPropsMap, props);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDefaultProps
+});

package/lib/ProForm/utils/index.d.ts

@@ -61,7 +61,6 @@ export declare function initialValuesToNames(values: AnyObject, columns: AnyObje
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
  */
 export declare function getArrayBeforeNumber(arr: (string | number)[]): (string | number)[];
-export declare const customEqualForFun: (value: any, other: any) => boolean;
 /**
  * 查询数据中是否包含rowKey
  */
@@ -102,4 +101,19 @@ export declare const parseNamePath: (input: string) => any;
  */
 export declare const getFormFieldPaths: (form: FormInstance) => any[];
 export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
+type DataItem = (string | number)[];
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export declare const mergeNames: (data1: DataItem[], data2: DataItem[]) => DataItem[];
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export declare const isListForm: (str: string) => boolean;
 export {};