@zat-design/sisyphus-react 3.4.2-beta.22 → 3.4.2-beta.24

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 (11) hide show
  1. package/dist/index.esm.css +5 -5
  2. package/dist/less.esm.css +4 -4
  3. package/es/ProForm/components/combination/FormList/index.js +4 -2
  4. package/es/ProLayout/components/ProHeader/style/index.less +2 -2
  5. package/es/ProTree/components/ProTreeSelect/index.js +5 -9
  6. package/es/style/theme/antd.less +1 -1
  7. package/lib/ProForm/components/combination/FormList/index.js +4 -2
  8. package/lib/ProLayout/components/ProHeader/style/index.less +2 -2
  9. package/lib/ProTree/components/ProTreeSelect/index.js +5 -9
  10. package/lib/style/theme/antd.less +1 -1
  11. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -932,12 +932,12 @@
932
932
  position: -webkit-sticky;
933
933
  position: sticky;
934
934
  z-index: 101;
935
- -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
936
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
935
+ -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
936
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
937
937
  }
938
938
  .pro-header.pro-header-shadow {
939
- -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
940
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
939
+ -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
940
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
941
941
  }
942
942
  .pro-header .ant-breadcrumb li {
943
943
  color: #1d2129;
@@ -5045,7 +5045,7 @@ input[type='button'] {
5045
5045
  -webkit-flex: 0 0 var(--zaui-form-label-width, 130px);
5046
5046
  -ms-flex: 0 0 var(--zaui-form-label-width, 130px);
5047
5047
  flex: 0 0 var(--zaui-form-label-width, 130px);
5048
- padding-right: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
5048
+ padding-right: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
5049
5049
  overflow: initial;
5050
5050
  line-height: 1;
5051
5051
  white-space: pre-wrap;
package/dist/less.esm.css CHANGED
@@ -932,12 +932,12 @@
932
932
  position: -webkit-sticky;
933
933
  position: sticky;
934
934
  z-index: 101;
935
- -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
936
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
935
+ -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
936
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
937
937
  }
938
938
  .pro-header.pro-header-shadow {
939
- -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
940
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
939
+ -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
940
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
941
941
  }
942
942
  .pro-header .ant-breadcrumb li {
943
943
  color: #1d2129;
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/ProHeader/style/index.less CHANGED
@@ -102,11 +102,11 @@
102
102
  &.pro-header-fixed {
103
103
  position: sticky;
104
104
  z-index: 101;
105
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
105
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
106
106
  }
107
107
 
108
108
  &.pro-header-shadow {
109
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
109
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
110
110
  }
111
111
 
112
112
  .@{ant-prefix}-breadcrumb {
package/es/ProTree/components/ProTreeSelect/index.js CHANGED
@@ -11,6 +11,8 @@ import _TreeSelect from "antd/es/tree-select";
11
11
  var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
12
12
  _excluded2 = ["children"];
13
13
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
14
+ /* eslint-disable react/no-danger */
15
+ /* eslint-disable react/jsx-closing-tag-location */
14
16
  import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
15
17
  import classnames from 'classnames';
16
18
  import { useImperativeHandle, forwardRef } from 'react';
@@ -282,8 +284,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
282
284
  */
283
285
  var renderTreeNode = function renderTreeNode(node, grade) {
284
286
  var children = node.children,
285
- icon = node.icon,
286
- hideNodeClass = node.hideNodeClass;
287
+ icon = node.icon;
287
288
  var labelText = node[label];
288
289
  var value = node[code];
289
290
  var titleHtml = _jsx("span", {
@@ -302,10 +303,10 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
302
303
  children: [_jsx("span", {
303
304
  className: "check-option-text-content",
304
305
  children: titleHtml
305
- }), _jsx("span", {
306
+ }), !disabled ? _jsx("span", {
306
307
  className: "check-mark-icon",
307
308
  children: _jsx(Icon, {})
308
- })]
309
+ }) : null]
309
310
  });
310
311
  if (!children) {
311
312
  return _jsx(_TreeSelect.TreeNode, {
@@ -357,10 +358,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
357
358
  item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
358
359
  }
359
360
  currentAllNodeChild.push(item);
360
- // if (tag || item?.children?.length) {
361
- // // 如果子节点有匹配项或者自己匹配了那么都加入结果中
362
- // currentAllNodeChild.push(item);
363
- // }
364
361
  }
365
362
  return currentAllNodeChild;
366
363
  };
@@ -473,7 +470,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
473
470
  var treeProps = _objectSpread({
474
471
  disabled: disabled,
475
472
  showSearch: showSearch,
476
- // filterTreeNode: filterTreeNodeEvent,
477
473
  treeDefaultExpandAll: defaultExpandAll,
478
474
  treeExpandedKeys: expandedKeys,
479
475
  treeCheckable: treeCheckable,
package/es/style/theme/antd.less CHANGED
@@ -24,7 +24,7 @@
24
24
  // label 超过130px换行
25
25
  .@{ant-prefix}-form-item-label {
26
26
  flex: 0 0 @zaui-form-label-width;
27
- padding-right: @zaui-space-size-sm;
27
+ padding-right: @zaui-space-size-md;
28
28
  overflow: initial;
29
29
  line-height: 1;
30
30
  white-space: pre-wrap;
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/ProHeader/style/index.less CHANGED
@@ -102,11 +102,11 @@
102
102
  &.pro-header-fixed {
103
103
  position: sticky;
104
104
  z-index: 101;
105
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
105
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
106
106
  }
107
107
 
108
108
  &.pro-header-shadow {
109
- box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
109
+ box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
110
110
  }
111
111
 
112
112
  .@{ant-prefix}-breadcrumb {
package/lib/ProTree/components/ProTreeSelect/index.js CHANGED
@@ -19,6 +19,8 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
19
19
  var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
20
20
  var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
21
21
  _excluded2 = ["children"];
22
+ /* eslint-disable react/no-danger */
23
+ /* eslint-disable react/jsx-closing-tag-location */
22
24
  var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
23
25
  var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
24
26
  // 全局属性配置在ConfigProvider
@@ -284,8 +286,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
284
286
  */
285
287
  var renderTreeNode = function renderTreeNode(node, grade) {
286
288
  var children = node.children,
287
- icon = node.icon,
288
- hideNodeClass = node.hideNodeClass;
289
+ icon = node.icon;
289
290
  var labelText = node[label];
290
291
  var value = node[code];
291
292
  var titleHtml = (0, _jsxRuntime.jsx)("span", {
@@ -304,10 +305,10 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
304
305
  children: [(0, _jsxRuntime.jsx)("span", {
305
306
  className: "check-option-text-content",
306
307
  children: titleHtml
307
- }), (0, _jsxRuntime.jsx)("span", {
308
+ }), !disabled ? (0, _jsxRuntime.jsx)("span", {
308
309
  className: "check-mark-icon",
309
310
  children: (0, _jsxRuntime.jsx)(Icon, {})
310
- })]
311
+ }) : null]
311
312
  });
312
313
  if (!children) {
313
314
  return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
@@ -359,10 +360,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
359
360
  item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
360
361
  }
361
362
  currentAllNodeChild.push(item);
362
- // if (tag || item?.children?.length) {
363
- // // 如果子节点有匹配项或者自己匹配了那么都加入结果中
364
- // currentAllNodeChild.push(item);
365
- // }
366
363
  }
367
364
  return currentAllNodeChild;
368
365
  };
@@ -475,7 +472,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
475
472
  var treeProps = (0, _objectSpread2.default)({
476
473
  disabled: disabled,
477
474
  showSearch: showSearch,
478
- // filterTreeNode: filterTreeNodeEvent,
479
475
  treeDefaultExpandAll: defaultExpandAll,
480
476
  treeExpandedKeys: expandedKeys,
481
477
  treeCheckable: treeCheckable,
package/lib/style/theme/antd.less CHANGED
@@ -24,7 +24,7 @@
24
24
  // label 超过130px换行
25
25
  .@{ant-prefix}-form-item-label {
26
26
  flex: 0 0 @zaui-form-label-width;
27
- padding-right: @zaui-space-size-sm;
27
+ padding-right: @zaui-space-size-md;
28
28
  overflow: initial;
29
29
  line-height: 1;
30
30
  white-space: pre-wrap;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.2-beta.22",
3
+ "version": "3.4.2-beta.24",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",