@zat-design/sisyphus-react 3.4.2 → 3.4.3

package/lib/ProForm/propsType.d.ts

@@ -39,9 +39,13 @@ export interface ProFormOtherProps {
     disabled: boolean;
     show?: boolean | (() => boolean);
     required?: boolean | (() => boolean);
+    mode?: string;
+    namePath?: any[] | string | number;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
+    /** 全局控制优先 */
+    globalControl?: boolean;
     mode?: ModeEnum;
     formKey?: string;
     /** 是否查看 */
@@ -67,7 +71,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/lib/ProForm/style/index.less

@@ -31,16 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
-  .pro-collapse-level2 {
-    .@{ant-prefix}-collapse-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
@@ -135,7 +125,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
@@ -147,8 +137,22 @@
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .ant-select-selector,
+          .ant-input-affix-wrapper,
+          .ant-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .ant-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;

package/lib/ProForm/utils/{contrastOriginal.d.ts → diffOriginal.d.ts}

@@ -3,7 +3,8 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
-export declare const contrastOriginal: (params: Params) => boolean;
+export declare const diffOriginal: (params: Params) => boolean;
 export {};

package/lib/ProForm/utils/diffOriginal.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.diffOriginal = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _lodash = require("lodash");
+var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+var extractValue = function extractValue(obj, path) {
+  var value = obj || {};
+  if (!Object.keys(obj)) {
+    return [];
+  }
+  var _iterator = (0, _createForOfIteratorHelper2.default)(path),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      if (value && value.hasOwnProperty(key)) {
+        value = value[key];
+      } else {
+        return undefined;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Object.values(value);
+};
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(data, pathString) {
+  if (pathString.includes('_')) {
+    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
+    return extractValue(data, namePrefixes);
+  }
+  return pathString.split('-').map(function (item) {
+    return data[item];
+  });
+};
+var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  // 支持传入自定义比较事件
+  if ((0, _lodash.isFunction)(equalWith)) {
+    return !equalWith(originalValue, value);
+  }
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return false;
+    });
+  }
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !(0, _lodash.isEqual)(value, originalValue);
+  }
+  return false;
+};

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

@@ -26,7 +26,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
  */
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
-export declare const contrast: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
+export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
 export declare const splitNameStr: (name: string) => NamePath[];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];

package/lib/ProForm/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.diffField = exports.deleteForPath = exports.customEqualForFun = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
@@ -124,7 +124,7 @@ var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-var contrast = exports.contrast = function contrast(prevValues, curValues, names) {
+var diffField = exports.diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _lodash.default.get(prevValues, name) !== _lodash.default.get(curValues, name);
   });

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

@@ -6,5 +6,5 @@ interface TransformProps extends FormItemProps {
     namePath: any[];
 }
 type TransformFun = 'normalize' | 'getValueProps' | 'shouldUpdate' | 'name';
-declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string) => Pick<TransformProps, TransformFun>;
+declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string, type?: string) => Pick<TransformProps, TransformFun>;
 export default transformNames;

package/lib/ProForm/utils/transformNames.js

@@ -6,17 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _lodash = require("lodash");
 var _transformValue2 = require("./transformValue");
-var transformNames = function transformNames(formItem, form, names, fieldName) {
+var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  var _names = names;
+  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  var _transformValue = (0, _transformValue2.transformValue)(names, form, _fieldName, normalize, getValueProps),
+  if (type === 'Group' && (0, _lodash.isNumber)((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
+    _names = _names.map(function (item) {
+      return (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
+    });
+  }
+  var _transformValue = (0, _transformValue2.transformValue)(_names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

package/lib/ProForm/utils/transformValue.js

@@ -48,7 +48,7 @@ var transformValue = exports.transformValue = function transformValue(names, for
       }, cusRest);
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
-      return (0, _utils.contrast)(prevValues, curValues, names);
+      return (0, _utils.diffField)(prevValues, curValues, names);
     }
   };
 };

package/lib/ProForm/utils/useChanged.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _contrastOriginal = require("./contrastOriginal");
+var _diffOriginal = require("./diffOriginal");
 var useChanged = exports.useChanged = function useChanged(_ref) {
   var name = _ref.name,
     names = _ref.names,
@@ -21,11 +21,12 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
   if (notWatch) form = [];
   var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
-  var changed = (0, _contrastOriginal.contrastOriginal)({
+  var changed = (0, _diffOriginal.diffOriginal)({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

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

@@ -1,7 +1,7 @@
 import { FormInstance } from 'antd';
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 interface Params {
-    name?: NamePath;
+    name?: any;
     names?: NamePath[];
     namesStr?: NamePath;
     originalName?: NamePath;

package/lib/ProForm/utils/useListChanged.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useListChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _contrastOriginal = require("./contrastOriginal");
+var _diffOriginal = require("./diffOriginal");
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -32,6 +32,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
     var rowValue = form.getFieldValue(rowValueNamePath);
+    if (!rowValue) return undefined;
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
@@ -88,11 +89,12 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
   if (notWatch) _form = [];
   var value = _antd.Form.useWatch(namePath, _form);
   if (notWatch || noChange) return [false];
-  var changed = (0, _contrastOriginal.contrastOriginal)({
+  var changed = (0, _diffOriginal.diffOriginal)({
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

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

@@ -1,28 +1,33 @@
 declare const _default: {
     /** 年月日 */
-    date: ({ type, toISOString }: {
+    date: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 时分秒 */
-    dateTime: ({ type, toISOString }: {
+    dateTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 00:00:00 */
-    dateStartTime: ({ type, toISOString }: {
+    dateStartTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 23:59:59 */
-    dateEndTime: ({ type, toISOString }: {
+    dateEndTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 年月日 00:00:00 ~ 年月日 23:59:59 */
-    dateStartEndTime: ({ type, toISOString }: {
+    dateStartEndTime: ({ type, toISOString, mode }: {
         type: any;
         toISOString: any;
+        mode: any;
     }) => {};
     /** 百分比 */
     percentage: ({ type, valueType }: {

package/lib/ProForm/utils/valueType.js

@@ -160,51 +160,61 @@ var _default = exports.default = {
   /** 年月日 */
   date: function date(_ref3) {
     var type = _ref3.type,
-      toISOString = _ref3.toISOString;
+      toISOString = _ref3.toISOString,
+      mode = _ref3.mode;
     return dateTransform({
       type: type,
       _valueType: 'date',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 时分秒 */
   dateTime: function dateTime(_ref4) {
     var type = _ref4.type,
-      toISOString = _ref4.toISOString;
+      toISOString = _ref4.toISOString,
+      mode = _ref4.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 00:00:00 */
   dateStartTime: function dateStartTime(_ref5) {
     var type = _ref5.type,
-      toISOString = _ref5.toISOString;
+      toISOString = _ref5.toISOString,
+      mode = _ref5.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 23:59:59 */
   dateEndTime: function dateEndTime(_ref6) {
     var type = _ref6.type,
-      toISOString = _ref6.toISOString;
+      toISOString = _ref6.toISOString,
+      mode = _ref6.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateEndTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 年月日 00:00:00 ~ 年月日 23:59:59 */
   dateStartEndTime: function dateStartEndTime(_ref7) {
     var type = _ref7.type,
-      toISOString = _ref7.toISOString;
+      toISOString = _ref7.toISOString,
+      mode = _ref7.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartEndTime',
-      toISOString: toISOString
+      toISOString: toISOString,
+      mode: mode
     });
   },
   /** 百分比 */

package/lib/ProIcon/config/index.d.ts

@@ -1,4 +1,5 @@
 export declare const iconMap: {
     type: string;
-    text: string;
+    'text-cn': string;
+    'text-en': string;
 }[];