@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/es/ProForm/style/index.less

@@ -1,10 +1,14 @@
-@import '../components/old/EnumSelect/style/index.less';
 @import '../components/base/SwitchCheckbox/style/index.less';
-@import '../components/base/FormList/style/index.less';
+@import '../components/base/TextArea/index.less';
+@import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
 @import '../components/combination/ProAddressBar/style/index.less';
 @import '../components/combination/ProNumberRange/style/index.less';
 @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 {
   .pro-collapse-level2 {
@@ -13,7 +17,25 @@
     }
   }
 
+  .ant-form-item-control-input {
+    flex-grow: 1;
+    max-width: 100%;
+  }
+
+  span.ant-input-clear-icon {
+    display: unset;
+    visibility: hidden;
+  }
+
+  .ant-input-affix-wrapper:hover span.ant-input-clear-icon {
+    display: unset;
+    visibility: unset;
+  }
 
+  .ant-input-affix-wrapper:hover span.ant-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+    display: unset;
+    visibility: hidden;
+  }
 
   &.pro-form-view {
     .ant-form-item-label {
@@ -23,20 +45,13 @@
     }
 
     .ant-form-item {
-      margin-bottom: var(--zaui-space-size-md, 16px);
-    }
-
-    .ant-form-item * {
-      line-height: 1 !important;
-      height     : auto !important;
-      min-height : auto !important;
+      margin-bottom: 0 !important;
     }
 
     .ant-form-item {
       .ant-tree-icon-hide input {
         display: none !important;
       }
-
     }
   }
 
@@ -53,7 +68,7 @@
   // 展开折叠按钮
   .expand-button {
     line-height: 32px;
-    cursor     : pointer;
+    cursor: pointer;
 
     .rotate-to-top {
       transform: rotate(90deg);
@@ -65,21 +80,19 @@
   }
 
   .ant-form-item {
-    display: flex;
+    margin-bottom: 22px !important;
 
     .ant-form-item-tooltip {
       svg {
-        width         : 14px;
-        height        : 14px;
+        width: 14px;
+        height: 14px;
         vertical-align: bottom;
-        fill          : #909090;
+        fill: #909090;
       }
     }
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
-      background: #fffaa1;
-
       span.ant-input-affix-wrapper,
       .ant-select-selector,
       .ant-picker {
@@ -90,18 +103,6 @@
         }
       }
 
-      .ant-checkbox-group {
-        label:not([class~='ant-checkbox-wrapper-checked']) {
-          .ant-checkbox-inner {
-            background: #fffaa1;
-
-            input {
-              background: #fffaa1;
-            }
-          }
-        }
-      }
-
       #switch {
         background: #bfbfbf;
       }
@@ -110,7 +111,7 @@
     // 自定义label宽度场景
     &.label-width {
       .ant-form-item-label {
-        width    : auto !important;
+        width: auto !important;
         max-width: fit-content !important;
       }
     }
@@ -123,11 +124,6 @@
       display: none;
     }
 
-    &.ant-form-item-with-help {
-      transition   : none;
-      margin-bottom: 0;
-    }
-
     .ant-form-item-explain {
       height: auto;
 
@@ -136,8 +132,6 @@
       }
     }
 
-
-
     .ant-input-number {
       width: 100%;
     }
@@ -153,9 +147,9 @@
         }
 
         .range-right {
-          width                    : 100%;
-          border                   : 1px solid #d9d9d9;
-          border-top-left-radius   : 0;
+          width: 100%;
+          border: 1px solid #d9d9d9;
+          border-top-left-radius: 0;
           border-bottom-left-radius: 0;
         }
       }
@@ -168,7 +162,6 @@
 
   // 查看模式
   &.mode-view {
-
     // 查看模式样式覆盖
     .ant-input[disabled] {
       .noDisabled();
@@ -182,7 +175,7 @@
       .noDisabled();
     }
 
-    .ant-picker-input>input[disabled] {
+    .ant-picker-input > input[disabled] {
       .noDisabled();
     }
 
@@ -217,8 +210,8 @@
       }
 
       background-color: #fff;
-      cursor          : default;
-      opacity         : 1;
+      cursor: default;
+      opacity: 1;
     }
 
     .ant-radio-wrapper.ant-radio-wrapper-checked.ant-radio-wrapper-disabled {
@@ -228,10 +221,10 @@
         display: none;
       }
 
-      >span {
+      > span {
         .noDisabled();
         position: relative;
-        top     : -3px;
+        top: -3px;
       }
     }
 
@@ -246,10 +239,10 @@
         display: none;
       }
 
-      >span {
+      > span {
         .noDisabled();
         position: relative;
-        top     : -3px;
+        top: -3px;
       }
     }
 
@@ -269,7 +262,7 @@
 
     .ant-input-affix-wrapper-disabled {
       background-color: transparent;
-      border          : none;
+      border: none;
     }
 
     .ant-select-selection-placeholder {
@@ -282,7 +275,7 @@
   }
 
   .ant-form-item-label {
-    >label {
+    > label {
       white-space: pre-wrap;
     }
   }
@@ -292,16 +285,20 @@
   }
 
   .ant-form-item-has-error {
+    .group-separator {
+      color: var(--ant-error-color);
+      border-color: var(--ant-error-color);
+    }
+
     .site-input-split {
       border-color: #ff4d4f;
     }
   }
 
   .site-input-group-wrapper {
-
     // 范围值表单样式
     & .site-input-split {
-      text-align      : center;
+      text-align: center;
       background-color: #fafafa;
 
       &.site-input-split-disabled {
@@ -347,33 +344,33 @@
       }
     }
 
-    &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+    &.ant-input-group.ant-input-group-compact > *:not(:last-child) {
       margin-right: 0;
     }
 
-    >*:first-child {
-      border-top-right-radius   : 0 !important;
+    > *:first-child {
+      border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-right-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-right-radius: 0 !important;
         border-bottom-right-radius: 0 !important;
       }
     }
 
-    >*:last-child {
-      border-top-left-radius   : 0 !important;
+    > *:last-child {
+      border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-left-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-left-radius: 0 !important;
         border-bottom-left-radius: 0 !important;
       }
     }
   }
 
-  .ant-input-group.ant-input-group-compact>* {
-    float         : none;
+  .ant-input-group.ant-input-group-compact > * {
+    float: none;
     vertical-align: top;
   }
 
@@ -382,28 +379,33 @@
   }
 
   .noDisabled {
-    color           : #333;
-    font-size       : 14px;
+    color: #333;
+    font-size: 14px;
     background-color: transparent;
-    border          : none;
-    cursor          : default;
-    opacity         : 1;
+    border: none;
+    cursor: default;
+    opacity: 1;
   }
 
   div.pro-form-custom-footer {
-    align-self: start;
-    width     : unset !important;
+    width: unset !important;
+    height: 32px;
+    margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
+
+    &.pro-form-custom-footer-hidden {
+      display: none;
+    }
   }
 
   .pro-form-view-container {
-    display   : inline-block;
+    display: inline-block;
+    color: var(--zaui-text, #343434);
     word-break: break-all;
-    color     : var(--zaui-text, #343434);
   }
 
   .pro-form-view-container_nowrap {
-    overflow     : hidden;
-    white-space  : nowrap;
+    overflow: hidden;
+    white-space: nowrap;
     text-overflow: ellipsis;
   }
 
@@ -414,4 +416,4 @@
   .delete-icon {
     width: 18px;
   }
-}
+}

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

@@ -1,7 +1,6 @@
 import { ColProps, FormProps } from 'antd';
 import { InternalNamePath, NamePath } from 'antd/es/form/interface';
 interface transProps {
-    modeFooter: boolean;
     formProps: FormProps;
     colProps: ColProps;
     [name: string]: any;
@@ -19,13 +18,31 @@ export declare const isSelect: (props: any) => any;
  * @returns {}
  */
 export declare const isTrim: (type: string, trim: boolean) => any;
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+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 splitNameStr: (name: string) => NamePath[];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
 export declare const isNullValue: (value: any) => boolean;
-export declare const isNullArray: (value: any, length: any) => boolean;
+/**
+ * 判断数组中是否包含空值 一个为空则为true
+ * @param arr 值
+ * @returns boole
+ */
+export declare const isNotFullArray: (arr: any, length: any) => boolean;
+/**
+ * 判断数组中值是否都为空 全部为空则为true
+ * @param arr 值
+ * @returns boole
+ */
+export declare const isNullArray: (arr: any) => boolean;
 export declare function toArray<T>(value?: T | T[] | null): T[];
 /**
  * names值合并
@@ -59,4 +76,12 @@ export declare const view: (obj: any) => boolean;
  * @returns 位数
  */
 export declare const getDecimalDigits: (num: number) => number;
+export declare const deleteForPath: (values: any, namePath: string | number | (string | number)[]) => void;
+/**
+ * 获取树状结构option
+ * @param treeData 树数据源
+ * @param value 选中值
+ * @returns {}
+ */
+export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
 export {};

package/es/ProForm/utils/index.js

@@ -1,10 +1,10 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { useState } from 'react';
-import _, { isObject, isFunction, cloneDeep } from 'lodash';
+import _, { isObject, isFunction, cloneDeep, get, set, omit } from 'lodash';
 var colProps = {
   search: {
     span: 8
@@ -14,25 +14,22 @@ var colProps = {
   }
 };
 var footer = {
-  search: true,
+  search: false,
   drawer: false
 };
 export var getLayout = function getLayout(params) {
-  var mode = params.mode,
-    span = params.span,
+  var _params$span = params.span,
+    span = _params$span === void 0 ? 8 : _params$span,
     form = params.form;
-  var _colProps = _objectSpread({}, colProps[mode]);
-  if (span) {
-    _colProps.span = span;
-  }
   return {
-    modeFooter: footer[mode],
     formProps: {
       colon: false,
       labelAlign: 'left',
       labelWrap: true
     },
-    colProps: _colProps,
+    colProps: {
+      span: span || 8
+    },
     onCancel: function onCancel() {
       form.resetFields();
     },
@@ -57,7 +54,7 @@ export var useControlled = function useControlled(props) {
 export var isSelect = function isSelect(props) {
   var dataSource = props.dataSource,
     type = props.type;
-  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格
@@ -67,9 +64,38 @@ export var isSelect = function isSelect(props) {
  */
 export var isTrim = function isTrim(type, trim) {
   var result = {};
-  if (['Input', 'TextArea'].includes(type) && trim) {
+  if (['Input', 'TextArea', 'ProCombination'].includes(type) && trim) {
+    result.getValueFromEvent = function (event) {
+      var _event$target$value;
+      if (Array.isArray(event)) {
+        return event.map(function (value) {
+          return (value === null || value === void 0 ? void 0 : value.trim()) || '';
+        });
+      }
+      return ((_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.trim()) || '';
+    };
+  }
+  return result;
+};
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+export var isUpperCase = function isUpperCase(type, upperCase) {
+  var result = {};
+  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
-      return event.target.value.trim();
+      var _event$target, _event$target$value2;
+      if (Array.isArray(event)) {
+        return event.map(function (value) {
+          var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+          return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
+        });
+      }
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value2 = _event$target.value) === null || _event$target$value2 === void 0 ? void 0 : _event$target$value2.replace(/[^a-zA-Z]/g, '');
+      return newValue.toUpperCase() || '';
     };
   }
   return result;
@@ -143,21 +169,48 @@ var nullList = [undefined, 'null', '""', '[]'];
 export var isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
 };
-// 判断数组是否算空
-export var isNullArray = function isNullArray(value, length) {
-  var hasValue = false;
-  var hasNullValue = false;
-  if (Array.isArray(value)) {
-    for (var i = 0; i < length; i++) {
-      if (!isNullValue(value[i])) {
-        hasValue = true;
-      } else {
-        hasNullValue = true;
-      }
-    }
-    return hasValue && hasNullValue;
+/**
+ * 判断数组中是否包含空值 一个为空则为true
+ * @param arr 值
+ * @returns boole
+ */
+export var isNotFullArray = function isNotFullArray(arr, length) {
+  if (!Array.isArray(arr)) {
+    return false;
   }
-  return !value;
+  if (arr.length < length) return true;
+  return arr.some(function (item) {
+    if (item === undefined || item === null) {
+      return true;
+    }
+    if (typeof item === 'string' && item.trim().length === 0) {
+      return true;
+    }
+    if (Array.isArray(item) && item.length === 0) {
+      return true;
+    }
+    return false;
+  });
+};
+/**
+ * 判断数组中值是否都为空 全部为空则为true
+ * @param arr 值
+ * @returns boole
+ */
+export var isNullArray = function isNullArray(arr) {
+  if (!Array.isArray(arr)) return !arr;
+  return arr.every(function (item) {
+    if (item === undefined || item === null) {
+      return true;
+    }
+    if (typeof item === 'string' && item.trim().length === 0) {
+      return true;
+    }
+    if (Array.isArray(item) && item.length === 0) {
+      return true;
+    }
+    return false;
+  });
 };
 export function toArray(value) {
   if (value === undefined || value === null) {
@@ -218,7 +271,9 @@ export function processHyphenKeys(obj) {
  * @param obj AnyObject
  * @returns AnyObject
  */
-export function initialValuesToNames(values, columns) {
+export function initialValuesToNames() {
+  var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var columns = arguments.length > 1 ? arguments[1] : undefined;
   var result = {};
   if (!Array.isArray(columns)) {
     return result;
@@ -229,10 +284,22 @@ export function initialValuesToNames(values, columns) {
       var key = (_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.map(function (name) {
         return Array.isArray(name) ? name.join('_') : name;
       }).join('-');
-      values[key] = undefined;
+      var formInitialValue = item.names.map(function (name, index) {
+        if (item.initialValue) {
+          set(values, name, item.initialValue[index]);
+        }
+        return get(values, name);
+      });
+      // 过滤掉不存在的初始值  防止names字段值为空数组
+      var namesInitialValue = formInitialValue.filter(function (item) {
+        return item !== undefined;
+      });
+      if (namesInitialValue.length) {
+        values[key] = formInitialValue;
+      }
     }
   });
-  return processHyphenKeys(values);
+  return values;
 }
 /**
  * 获取数组含数字的新数组
@@ -290,4 +357,45 @@ export var view = function view(obj) {
 export var getDecimalDigits = function getDecimalDigits(num) {
   var match = num.toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
+};
+export var deleteForPath = function deleteForPath(values, namePath) {
+  if (Array.isArray(namePath)) {
+    var current = values;
+    namePath.every(function (nameItem, index) {
+      if (index === namePath.length - 1) {
+        delete current[nameItem];
+        return false;
+      }
+      if (_typeof(current[nameItem]) !== 'object') {
+        return false;
+      }
+      current = current[nameItem];
+      return true;
+    });
+    return;
+  }
+  delete values[namePath];
+};
+/**
+ * 获取树状结构option
+ * @param treeData 树数据源
+ * @param value 选中值
+ * @returns {}
+ */
+export var findOptionByValue = function findOptionByValue(treeData, value) {
+  if (isObject(value)) {
+    return value;
+  }
+  for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
+    var node = treeData[i];
+    if (node.value === value) {
+      return omit(node, ['children']);
+    }
+    if (node.children) {
+      var foundNode = findOptionByValue(node.children, value);
+      if (foundNode) {
+        return omit(foundNode, ['children']);
+      }
+    }
+  }
 };

package/es/ProForm/utils/rulesCreator.d.ts

@@ -1 +1 @@
-export declare const rulesCreator: (rules: any, label: any, isSelect: any) => any;
+export declare const rulesCreator: (rules: any, label: any, isSelect: any) => any[];

package/es/ProForm/utils/rulesCreator.js

@@ -1,8 +1,12 @@
-import { validate, regExp } from '@zat-design-pro-component/utils';
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { validate, regExp } from '@zat-design/utils';
 import { isNullValue } from './index';
 export var rulesCreator = function rulesCreator(rules, label, isSelect) {
+  var _result;
   var message = "".concat(isSelect ? '请选择' : '请输入', "\u6B63\u786E\u7684").concat(label || '');
-  return rules.map(function (rule) {
+  var result = [];
+  result = rules.map(function (ruleItem) {
+    var rule = _objectSpread({}, ruleItem);
     if (rule instanceof Object && 'type' in rule) {
       if (Object.keys(regExp).includes(rule.type)) {
         rule.validator = function (rule, value) {
@@ -23,4 +27,10 @@ export var rulesCreator = function rulesCreator(rules, label, isSelect) {
     }
     return rule;
   });
+  if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
+    result = [{
+      required: false
+    }];
+  }
+  return result;
 };

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

@@ -1,5 +1,5 @@
 import { FormInstance, FormItemProps } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
+import { NamePath } from 'antd/es/form/interface';
 interface TransformProps extends FormItemProps {
     names: NamePath[];
     form: FormInstance;