@zat-design/sisyphus-react 3.4.2-beta.21 → 3.4.2-beta.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/index.esm.css +2 -2
  2. package/dist/less.esm.css +2 -2
  3. package/es/ProForm/components/combination/FormList/index.js +4 -2
  4. package/es/ProLayout/components/ProCollapse/style/index.less +1 -1
  5. package/es/ProLayout/style/index.less +1 -1
  6. package/lib/ProForm/components/combination/FormList/index.js +4 -2
  7. package/lib/ProLayout/components/ProCollapse/style/index.less +1 -1
  8. package/lib/ProLayout/style/index.less +1 -1
  9. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -750,7 +750,7 @@
750
750
  margin-right: var(--zaui-space-size-sm, 8px);
751
751
  }
752
752
  .pro-collapse.pro-collapse-level2 .pro-collapse-content {
753
- padding-top: var(--zaui-space-size-sm, 8px) !important;
753
+ padding: var(--zaui-space-size-sm, 8px) 0 !important;
754
754
  }
755
755
  .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse {
756
756
  margin-bottom: var(--zaui-space-size-md, 16px);
@@ -1237,7 +1237,7 @@
1237
1237
  background: #fff;
1238
1238
  }
1239
1239
  .pro-layout.pro-layout-light .pro-collapse.pro-collapse-level2 .pro-collapse-content {
1240
- padding-bottom: var(--zaui-border-radius, 8px);
1240
+ padding-bottom: var(--zaui-space-size-sm, 8px);
1241
1241
  }
1242
1242
  .pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .ant-collapse-header {
1243
1243
  border-radius: var(--zaui-border-radius, 8px) !important;
package/dist/less.esm.css CHANGED
@@ -750,7 +750,7 @@
750
750
  margin-right: var(--zaui-space-size-sm, 8px);
751
751
  }
752
752
  .pro-collapse.pro-collapse-level2 .pro-collapse-content {
753
- padding-top: var(--zaui-space-size-sm, 8px) !important;
753
+ padding: var(--zaui-space-size-sm, 8px) 0 !important;
754
754
  }
755
755
  .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse {
756
756
  margin-bottom: var(--zaui-space-size-md, 16px);
@@ -1237,7 +1237,7 @@
1237
1237
  background: #fff;
1238
1238
  }
1239
1239
  .pro-layout.pro-layout-light .pro-collapse.pro-collapse-level2 .pro-collapse-content {
1240
- padding-bottom: var(--zaui-border-radius, 8px);
1240
+ padding-bottom: var(--zaui-space-size-sm, 8px);
1241
1241
  }
1242
1242
  .pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .ant-collapse-header {
1243
1243
  border-radius: var(--zaui-border-radius, 8px) !important;
package/es/ProForm/components/combination/FormList/index.js CHANGED
@@ -43,15 +43,17 @@ var FormList = function FormList(props, ref) {
43
43
  names: item === null || item === void 0 ? void 0 : item.names,
44
44
  prefixNamePath: namePath
45
45
  })] : [fieldName].concat(_toConsumableArray(toArray(item.name)));
46
- return _objectSpread(_objectSpread({}, item), {}, {
46
+ var column = _objectSpread(_objectSpread({}, item), {}, {
47
47
  name: _name,
48
48
  names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
49
- return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
49
+ // 传给Group的names会被渲染成真实FormItem 不能传完整name
50
+ return item.type === 'Group' ? [fieldName].concat(_toConsumableArray(toArray(nameItem))) : [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
50
51
  }) : item.names,
51
52
  index: fieldName,
52
53
  namePath: namePath,
53
54
  label: mode === 'less' ? undefined : item.label
54
55
  });
56
+ return column;
55
57
  });
56
58
  }, [columns]);
57
59
  useImperativeHandle(ref, function () {
package/es/ProLayout/components/ProCollapse/style/index.less CHANGED
@@ -96,7 +96,7 @@
96
96
  }
97
97
 
98
98
  .pro-collapse-content {
99
- padding-top: var(--zaui-space-size-sm, 8px) !important;
99
+ padding: var(--zaui-space-size-sm, 8px) 0 !important;
100
100
  }
101
101
 
102
102
  .pro-collapse-level2-collapse {
package/es/ProLayout/style/index.less CHANGED
@@ -58,7 +58,7 @@
58
58
  background: #fff;
59
59
  }
60
60
  .pro-collapse-content{
61
- padding-bottom: var(--zaui-border-radius, 8px);
61
+ padding-bottom: var(--zaui-space-size-sm, 8px);
62
62
  }
63
63
  }
64
64
 
package/lib/ProForm/components/combination/FormList/index.js CHANGED
@@ -49,15 +49,17 @@ var FormList = function FormList(props, ref) {
49
49
  names: item === null || item === void 0 ? void 0 : item.names,
50
50
  prefixNamePath: namePath
51
51
  })] : [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(item.name)));
52
- return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
52
+ var column = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
53
53
  name: _name,
54
54
  names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
55
- return [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
55
+ // 传给Group的names会被渲染成真实FormItem 不能传完整name
56
+ return item.type === 'Group' ? [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem))) : [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
56
57
  }) : item.names,
57
58
  index: fieldName,
58
59
  namePath: namePath,
59
60
  label: mode === 'less' ? undefined : item.label
60
61
  });
62
+ return column;
61
63
  });
62
64
  }, [columns]);
63
65
  (0, _react.useImperativeHandle)(ref, function () {
package/lib/ProLayout/components/ProCollapse/style/index.less CHANGED
@@ -96,7 +96,7 @@
96
96
  }
97
97
 
98
98
  .pro-collapse-content {
99
- padding-top: var(--zaui-space-size-sm, 8px) !important;
99
+ padding: var(--zaui-space-size-sm, 8px) 0 !important;
100
100
  }
101
101
 
102
102
  .pro-collapse-level2-collapse {
package/lib/ProLayout/style/index.less CHANGED
@@ -58,7 +58,7 @@
58
58
  background: #fff;
59
59
  }
60
60
  .pro-collapse-content{
61
- padding-bottom: var(--zaui-border-radius, 8px);
61
+ padding-bottom: var(--zaui-space-size-sm, 8px);
62
62
  }
63
63
  }
64
64
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.2-beta.21",
3
+ "version": "3.4.2-beta.23",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",