@zat-design/sisyphus-react 3.5.1-beta.2 → 3.5.1-beta.4

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/es/ProEnum/index.js +1 -1
  2. package/es/ProForm/components/render/Render.js +2 -2
  3. package/es/ProForm/components/render/RenderFields.js +2 -2
  4. package/es/ProLayout/index.js +4 -3
  5. package/lib/ProEnum/index.js +1 -1
  6. package/lib/ProForm/components/render/Render.js +2 -2
  7. package/lib/ProForm/components/render/RenderFields.js +2 -2
  8. package/lib/ProLayout/index.js +3 -3
  9. package/package.json +1 -1
package/es/ProEnum/index.js CHANGED
@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
166
166
  }
167
167
  switch (type) {
168
168
  case 'ProSelect':
169
- return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
169
+ return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
170
170
  otherProps: otherProps,
171
171
  dataSource: list,
172
172
  fieldNames: {
package/es/ProForm/components/render/Render.js CHANGED
@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
34
34
  import ConfirmWrapper from './ConfirmWrapper';
35
35
  // 这个组件只管渲染, 参数的整理在外部处理
36
36
  var Render = function Render(props) {
37
- var _ref2, _ref3, _ref4, _ref5, _componentProps$disab, _otherProps$names2;
37
+ var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
38
38
  var component = props.component,
39
39
  originComponent = props.originComponent,
40
40
  _props$formItemProps = props.formItemProps,
@@ -177,7 +177,7 @@ var Render = function Render(props) {
177
177
  * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
178
178
  * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 > 全局【formDisabled】
179
179
  */
180
- var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = (_componentProps$disab = componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _componentProps$disab !== void 0 ? _componentProps$disab : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : _disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
180
+ var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
181
181
  /**
182
182
  * 最新fieldProps: 更新后的组件Props
183
183
  */
package/es/ProForm/components/render/RenderFields.js CHANGED
@@ -45,7 +45,7 @@ var RenderFields = function RenderFields(props) {
45
45
  });
46
46
  }
47
47
  var comList = columns.flatMap(function (column, index) {
48
- var _fieldProps$disabled;
48
+ var _formItemProps$disabl;
49
49
  if (!!expand && !openState) {
50
50
  // expand为Number时 过滤掉大于expand 且 非fixed的column
51
51
  if (typeof expand === 'number') {
@@ -127,7 +127,7 @@ var RenderFields = function RenderFields(props) {
127
127
  placeholder = formItemChildProps.placeholder,
128
128
  dataSource = formItemChildProps.dataSource;
129
129
  var formLabel = _formItemProps.label;
130
- var comDisabled = (_fieldProps$disabled = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) !== null && _fieldProps$disabled !== void 0 ? _fieldProps$disabled : _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled; // 组件属性层disabled fieldProps可能为函数
130
+ var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
131
131
  // 当前组件是不是一个选择组件
132
132
  var _isSelect = isSelect({
133
133
  dataSource: dataSource,
package/es/ProLayout/index.js CHANGED
@@ -1,5 +1,7 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
+ import "antd/es/message/style";
4
+ import _message from "antd/es/message";
3
5
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
4
6
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
5
7
  import { createContext } from 'react';
@@ -46,9 +48,8 @@ var ProLayout = function ProLayout(props) {
46
48
  set(props.collapsed || false);
47
49
  }, [props.collapsed]);
48
50
  useDeepCompareEffect(function () {
49
- if (Array.isArray(dataSource) && !dataSource.length || !dataSource) {
50
- console.warn('Warning: Missing menu data source, or menu data source is not an array');
51
- return;
51
+ if (Array.isArray(dataSource) && !dataSource.length) {
52
+ return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
52
53
  }
53
54
  var userData = transformMenus(dataSource);
54
55
  setState({
package/lib/ProEnum/index.js CHANGED
@@ -167,7 +167,7 @@ var ProEnum = function ProEnum(props) {
167
167
  }
168
168
  switch (type) {
169
169
  case 'ProSelect':
170
- return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['showCodeName'])), {}, {
170
+ return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
171
171
  otherProps: otherProps,
172
172
  dataSource: list,
173
173
  fieldNames: {
package/lib/ProForm/components/render/Render.js CHANGED
@@ -32,7 +32,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
32
32
  /* eslint-disable prefer-destructuring */
33
33
  // 这个组件只管渲染, 参数的整理在外部处理
34
34
  var Render = function Render(props) {
35
- var _ref2, _ref3, _ref4, _ref5, _componentProps$disab, _otherProps$names2;
35
+ var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
36
36
  var component = props.component,
37
37
  originComponent = props.originComponent,
38
38
  _props$formItemProps = props.formItemProps,
@@ -175,7 +175,7 @@ var Render = function Render(props) {
175
175
  * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
176
176
  * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 > 全局【formDisabled】
177
177
  */
178
- var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = (_componentProps$disab = componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _componentProps$disab !== void 0 ? _componentProps$disab : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : _disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
178
+ var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
179
179
  /**
180
180
  * 最新fieldProps: 更新后的组件Props
181
181
  */
package/lib/ProForm/components/render/RenderFields.js CHANGED
@@ -53,7 +53,7 @@ var RenderFields = function RenderFields(props) {
53
53
  });
54
54
  }
55
55
  var comList = columns.flatMap(function (column, index) {
56
- var _fieldProps$disabled;
56
+ var _formItemProps$disabl;
57
57
  if (!!expand && !openState) {
58
58
  // expand为Number时 过滤掉大于expand 且 非fixed的column
59
59
  if (typeof expand === 'number') {
@@ -135,7 +135,7 @@ var RenderFields = function RenderFields(props) {
135
135
  placeholder = formItemChildProps.placeholder,
136
136
  dataSource = formItemChildProps.dataSource;
137
137
  var formLabel = _formItemProps.label;
138
- var comDisabled = (_fieldProps$disabled = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) !== null && _fieldProps$disabled !== void 0 ? _fieldProps$disabled : _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled; // 组件属性层disabled fieldProps可能为函数
138
+ var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
139
139
  // 当前组件是不是一个选择组件
140
140
  var _isSelect = (0, _utils.isSelect)({
141
141
  dataSource: dataSource,
package/lib/ProLayout/index.js CHANGED
@@ -9,6 +9,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
9
9
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
11
  var _jsxRuntime = require("react/jsx-runtime");
12
+ var _antd = require("antd");
12
13
  var _react = require("react");
13
14
  var _classnames = _interopRequireDefault(require("classnames"));
14
15
  var _ahooks = require("ahooks");
@@ -53,9 +54,8 @@ var ProLayout = function ProLayout(props) {
53
54
  set(props.collapsed || false);
54
55
  }, [props.collapsed]);
55
56
  (0, _ahooks.useDeepCompareEffect)(function () {
56
- if (Array.isArray(dataSource) && !dataSource.length || !dataSource) {
57
- console.warn('Warning: Missing menu data source, or menu data source is not an array');
58
- return;
57
+ if (Array.isArray(dataSource) && !dataSource.length) {
58
+ return _antd.message.warning('Warning: Missing menu data source, or menu data source is not an array');
59
59
  }
60
60
  var userData = (0, _utils.transformMenus)(dataSource);
61
61
  setState({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.5.1-beta.2",
3
+ "version": "3.5.1-beta.4",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",