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

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

@@ -3,6 +3,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
 export type DiffType = 'same' | 'add' | 'changed';

package/lib/ProForm/utils/diffOriginal.js

@@ -1,36 +1,79 @@
-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 });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.diffOriginal = void 0;
+var _lodash = require("lodash");
+var _utils = require("../../utils");
+// 比较策略接口
+
+// 数字类型标准化函数
+var normalizeNumberValue = value => {
+  if (value === null || value === undefined || value === '') return null;
+  var num = Number(value);
+  return Number.isNaN(num) ? null : num;
 };
-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 });
+
+// InputNumber 比较策略
+var inputNumberStrategy = {
+  compare: (val1, val2) => {
+    var num1 = normalizeNumberValue(val1);
+    var num2 = normalizeNumberValue(val2);
+    return num1 === num2;
   }
-  return to;
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/ProForm/utils/diffOriginal.ts
-var diffOriginal_exports = {};
-__export(diffOriginal_exports, {
-  diffOriginal: () => diffOriginal
-});
-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;
+// ProNumberRange 比较策略
+var proNumberRangeStrategy = {
+  compare: (val1, val2) => {
+    if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
+    if (val1.length !== val2.length) return false;
+    return val1.every((item, index) => {
+      var num1 = normalizeNumberValue(item);
+      var num2 = normalizeNumberValue(val2[index]);
+      return num1 === num2;
+    });
+  }
+};
+
+// 数字类型处理函数
+var handleNumberTypeDiff = params => {
+  var originalValue = params.originalValue,
+    value = params.value,
+    type = params.type;
+  var isEmptyVal = (0, _utils.isEmpty)(value);
+  var isEmptyOrg = (0, _utils.isEmpty)(originalValue);
+
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+
+  // 根据类型选择对应的比较策略
+  var compareStrategy;
+  if (type === 'InputNumber') {
+    compareStrategy = inputNumberStrategy;
+  } else if (type === 'ProNumberRange') {
+    compareStrategy = proNumberRangeStrategy;
+  } else {
+    return 'changed'; // 未知类型视为已改变
+  }
+  return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
+};
+
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = data => {
+  if (!(0, _lodash.isObject)(data) || data === null) return data;
+
+  // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
-    let isFillNull = true;
-    const arr = data.map((item) => {
-      if ((0, import_utils.isEmpty)(item)) {
+    // 数组中全是empty值的话 视为null
+    var isFillNull = true;
+    var arr = data.map(item => {
+      if ((0, _utils.isEmpty)(item)) {
         return null;
       }
       isFillNull = false;
@@ -38,38 +81,49 @@ var filterObject = (data) => {
     });
     return isFillNull ? null : arr;
   }
-  const resData = {};
-  Object.keys(data).forEach((key) => {
-    if (!(0, import_utils.isEmpty)(data[key])) {
+  var resData = {};
+  Object.keys(data).forEach(key => {
+    if (!(0, _utils.isEmpty)(data[key])) {
       resData[key] = data[key];
     }
   });
-  if (!Object.keys(resData).length)
-    return null;
+
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
   return resData;
 };
-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";
+var diffOriginal = params => {
+  var originalValue = params.originalValue,
+    value = params.value,
+    onDiff = params.onDiff,
+    type = params.type;
+
+  // 支持传入自定义比较事件
+  if ((0, _lodash.isFunction)(onDiff)) {
+    var diffRes = onDiff(originalValue, value);
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
       }
       return diffRes;
     }
   }
-  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";
+  if (['InputNumber', 'ProNumberRange'].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
+
+  // 其他类型使用原有逻辑
+  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, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  diffOriginal
-});
+exports.diffOriginal = diffOriginal;

package/lib/ProForm/utils/getDefaultProps.js

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