ds-web-all 1.0.1-beta.21 → 1.0.1-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.
@@ -138,7 +138,7 @@ function CFFormItem(componentProps) {
138
138
  comProps.loading = loading;
139
139
  comProps.dataSource = remoteSource;
140
140
  }
141
- var showTipsUiType = ['select', 'radio', 'datepicker', 'date-range-picker', 'textarea', 'input', 'number', 'selectTag', 'selectUser', 'upload-file', 'checkbox-group', 'text', 'date-picker', 'switch'];
141
+ var hideTipsUiType = ['upload-img'];
142
142
  var isRequired = (0, _react.useMemo)(function () {
143
143
  return formItemProps.required !== undefined ? formItemProps.required : !!(formItemProps.rules && formItemProps.rules.some(function (rule) {
144
144
  if (rule && _typeof(rule) === 'object' && rule.required && !rule.warningOnly) {
@@ -164,7 +164,7 @@ function CFFormItem(componentProps) {
164
164
  }, formItemProps), /*#__PURE__*/_react.default.createElement(Com, _extends({}, comProps, {
165
165
  form: form,
166
166
  onChange: onComponentChange
167
- }))), (props === null || props === void 0 ? void 0 : props.tips) && showTipsUiType.indexOf(uiType) > -1 && /*#__PURE__*/_react.default.createElement("div", {
167
+ }))), (props === null || props === void 0 ? void 0 : props.tips) && hideTipsUiType.indexOf(uiType) === -1 && /*#__PURE__*/_react.default.createElement("div", {
168
168
  style: {
169
169
  color: '#999',
170
170
  fontSize: '12px',
@@ -39,6 +39,7 @@ var _textarea = _interopRequireDefault(require("./textarea"));
39
39
  var _cascaderSelect = _interopRequireDefault(require("./cascaderSelect"));
40
40
  var _linkText = _interopRequireDefault(require("../../link-text"));
41
41
  var _phoneSmsCode = _interopRequireDefault(require("./phoneSmsCode"));
42
+ var _switchText = _interopRequireDefault(require("./switch-text"));
42
43
  var _unSupport = _interopRequireDefault(require("./un-support"));
43
44
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
44
45
  /*
@@ -91,5 +92,6 @@ var _default = exports.default = {
91
92
  radio: _radioGroup.default,
92
93
  mobilePhone: _mobilePhone.default,
93
94
  linkText: _linkText.default,
94
- phoneSmsCode: _phoneSmsCode.default
95
+ phoneSmsCode: _phoneSmsCode.default,
96
+ switchText: _switchText.default
95
97
  };
@@ -0,0 +1,51 @@
1
+ "use strict";
2
+
3
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.default = void 0;
8
+ require("antd/es/switch/style");
9
+ var _switch = _interopRequireDefault(require("antd/es/switch"));
10
+ var _react = _interopRequireWildcard(require("react"));
11
+ var _excluded = ["value", "onChange", "checkedValue", "uncheckedValue"];
12
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
15
+ function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
16
+ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
17
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
18
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
19
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
20
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
21
+ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
22
+ function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
23
+ function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
24
+ var _default = exports.default = function _default(_ref) {
25
+ var value = _ref.value,
26
+ onChange = _ref.onChange,
27
+ _ref$checkedValue = _ref.checkedValue,
28
+ checkedValue = _ref$checkedValue === void 0 ? true : _ref$checkedValue,
29
+ _ref$uncheckedValue = _ref.uncheckedValue,
30
+ uncheckedValue = _ref$uncheckedValue === void 0 ? false : _ref$uncheckedValue,
31
+ others = _objectWithoutProperties(_ref, _excluded);
32
+ var _useState = (0, _react.useState)(value === checkedValue),
33
+ _useState2 = _slicedToArray(_useState, 2),
34
+ switchChecked = _useState2[0],
35
+ setSwitchChecked = _useState2[1];
36
+ var handleChange = function handleChange(checked) {
37
+ setSwitchChecked(checked);
38
+ onChange(checked ? checkedValue : uncheckedValue);
39
+ };
40
+ (0, _react.useEffect)(function () {
41
+ setSwitchChecked(value === checkedValue);
42
+ }, [value]);
43
+ return /*#__PURE__*/_react.default.createElement("div", {
44
+ style: {
45
+ lineHeight: '32px'
46
+ }
47
+ }, /*#__PURE__*/_react.default.createElement(_switch.default, _extends({
48
+ checked: switchChecked,
49
+ onChange: handleChange
50
+ }, others)));
51
+ };
@@ -60,8 +60,8 @@
60
60
 
61
61
  .section-caption {
62
62
  display: flex;
63
- align-items: center;
64
- justify-content: flex-end;
63
+ flex-direction: row-reverse;
64
+ justify-content: space-between;
65
65
  align-items: center;
66
66
  margin: 16px 0;
67
67
  }
@@ -78,7 +78,8 @@ var _default = exports.default = function _default(_ref2) {
78
78
  } : _ref2$requestDataForm,
79
79
  _ref2$moduleRoute = _ref2.moduleRoute,
80
80
  moduleRoute = _ref2$moduleRoute === void 0 ? '\\*' : _ref2$moduleRoute,
81
- dataSourceFormatter = _ref2.dataSourceFormatter;
81
+ dataSourceFormatter = _ref2.dataSourceFormatter,
82
+ extraTransparentParams = _ref2.extraTransparentParams;
82
83
  var match = (0, _reactRouterDom.useRouteMatch)();
83
84
  var history = (0, _reactRouterDom.useHistory)();
84
85
  var _useUnmounted = (0, _useUnmounted3.default)(),
@@ -634,7 +635,8 @@ var _default = exports.default = function _default(_ref2) {
634
635
  generateUrlByTreePaths: generateUrlByTreePaths,
635
636
  isInTree: true,
636
637
  firstLoaded: firstLoaded,
637
- updateDataSource: updateDataSource
638
+ updateDataSource: updateDataSource,
639
+ extraTransparentParams: extraTransparentParams
638
640
  };
639
641
  };
640
642
  var ComposeTreeContext = exports.ComposeTreeContext = /*#__PURE__*/_react.default.createContext(null);
@@ -31,7 +31,7 @@ var _blank = require("../blank");
31
31
  var _useComposeTree = _interopRequireWildcard(require("./hooks/use-compose-tree"));
32
32
  require("./index.less");
33
33
  var _excluded = ["onSelect", "onUserSelect", "routerConfig", "treeColWidth", "request", "renderSearchExtra", "groupTypeList", "typeKey", "renderTree"],
34
- _excluded2 = ["request", "extendModuleMap", "firstLoadAll", "expandAllTree", "typeKey", "groupTypeList", "requestDataFormatter", "moduleRoute", "dataSourceFormatter"];
34
+ _excluded2 = ["request", "extendModuleMap", "firstLoadAll", "expandAllTree", "typeKey", "groupTypeList", "requestDataFormatter", "moduleRoute", "dataSourceFormatter", "extraTransparentParams"];
35
35
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
36
36
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
37
37
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -163,6 +163,7 @@ var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (_
163
163
  requestDataFormatter = _ref3.requestDataFormatter,
164
164
  moduleRoute = _ref3.moduleRoute,
165
165
  dataSourceFormatter = _ref3.dataSourceFormatter,
166
+ extraTransparentParams = _ref3.extraTransparentParams,
166
167
  others = _objectWithoutProperties(_ref3, _excluded2);
167
168
  var composeTreeContext = (0, _useComposeTree.default)({
168
169
  request: {
@@ -175,7 +176,8 @@ var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (_
175
176
  groupTypeList: groupTypeList,
176
177
  requestDataFormatter: requestDataFormatter,
177
178
  moduleRoute: moduleRoute,
178
- dataSourceFormatter: dataSourceFormatter
179
+ dataSourceFormatter: dataSourceFormatter,
180
+ extraTransparentParams: extraTransparentParams
179
181
  });
180
182
  (0, _react.useImperativeHandle)(ref, function () {
181
183
  return {
@@ -8,9 +8,11 @@ var _react = _interopRequireDefault(require("react"));
8
8
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  var InnerPanel = exports.InnerPanel = function InnerPanel(_ref) {
10
10
  var children = _ref.children,
11
- size = _ref.size;
11
+ size = _ref.size,
12
+ _ref$className = _ref.className,
13
+ className = _ref$className === void 0 ? '' : _ref$className;
12
14
  return /*#__PURE__*/_react.default.createElement("div", {
13
- className: "ss-splitter-panel",
15
+ className: ['ss-splitter-panel', className].join(' '),
14
16
  style: {
15
17
  flexBasis: size,
16
18
  flexGrow: size ? 1 : 0,
@@ -41,6 +41,8 @@ var Splitter = function Splitter(_ref) {
41
41
  _ref$disabledHideBar = _ref.disabledHideBar,
42
42
  disabledHideBar = _ref$disabledHideBar === void 0 ? true : _ref$disabledHideBar,
43
43
  className = _ref.className,
44
+ _ref$sizes = _ref.sizes,
45
+ sizes = _ref$sizes === void 0 ? [] : _ref$sizes,
44
46
  style = _ref.style;
45
47
  var splitterRef = (0, _react.useRef)(null);
46
48
  var _useRefState = (0, _useRefState3.default)([]),
@@ -50,19 +52,22 @@ var Splitter = function Splitter(_ref) {
50
52
  cacheSizesRef = _useRefState2[2];
51
53
  var panels = (0, _react.useMemo)(function () {
52
54
  return (Array.isArray(children) ? children : [children]).filter(_react.isValidElement).map(function (node, i) {
53
- var _props$size;
54
55
  var _ref2 = node,
55
56
  props = _ref2.props;
56
- return _objectSpread(_objectSpread({}, props), {}, {
57
- size: (_props$size = props.size) !== null && _props$size !== void 0 ? _props$size : cacheSizes[i]
58
- });
57
+ return _objectSpread({}, props);
58
+ });
59
+ }, [children]);
60
+ var propSizes = (0, _react.useMemo)(function () {
61
+ return panels.map(function (el, i) {
62
+ var _cacheSizes$i;
63
+ return (_cacheSizes$i = cacheSizes[i]) !== null && _cacheSizes$i !== void 0 ? _cacheSizes$i : sizes[i];
59
64
  });
60
- }, [cacheSizes, children]);
65
+ }, [cacheSizes, sizes, panels]);
61
66
  var _useState = (0, _react.useState)(0),
62
67
  _useState2 = _slicedToArray(_useState, 2),
63
68
  containerSize = _useState2[0],
64
69
  setContainerSize = _useState2[1];
65
- var _useSizes = (0, _useSize.default)(panels, containerSize),
70
+ var _useSizes = (0, _useSize.default)(panels, propSizes, containerSize),
66
71
  panelSizes = _useSizes.panelSizes;
67
72
  (0, _react.useEffect)(function () {
68
73
  var observer = new ResizeObserver(function (entries) {
@@ -82,7 +87,8 @@ var Splitter = function Splitter(_ref) {
82
87
  var moveBar = (0, _react.useRef)({
83
88
  oldSizePrev: 0,
84
89
  oldSizeNext: 0,
85
- index: -1
90
+ index: -1,
91
+ sizes: []
86
92
  });
87
93
  var _useMouseMove = (0, _useMouseMove2.default)({
88
94
  start: function start(e, i) {
@@ -90,7 +96,8 @@ var Splitter = function Splitter(_ref) {
90
96
  moveBar.current = {
91
97
  index: i,
92
98
  oldSizePrev: panelSizes[i - 1],
93
- oldSizeNext: panelSizes[i]
99
+ oldSizeNext: panelSizes[i],
100
+ sizes: _toConsumableArray(panelSizes)
94
101
  };
95
102
  return true;
96
103
  },
@@ -108,16 +115,14 @@ var Splitter = function Splitter(_ref) {
108
115
  end: function end(_ref4) {
109
116
  var changeX = _ref4.changeX,
110
117
  changeY = _ref4.changeY;
111
- console.log(changeX, changeY);
112
118
  if (moveBar.current.index === -1) return;
113
119
  var changePt = layout === 'horizontal' ? changeX : changeY;
114
- setCacheSizes(function (old) {
115
- old[moveBar.current.index - 1] = Math.max(0, Math.min(moveBar.current.oldSizePrev + moveBar.current.oldSizeNext, moveBar.current.oldSizePrev + changePt));
116
- old[moveBar.current.index] = Math.max(0, Math.min(moveBar.current.oldSizePrev + moveBar.current.oldSizeNext, moveBar.current.oldSizeNext - changePt));
117
- return _toConsumableArray(old);
118
- });
120
+ var old = _toConsumableArray(cacheSizesRef.current);
121
+ old[moveBar.current.index - 1] = Math.max(0, Math.min(moveBar.current.oldSizePrev + moveBar.current.oldSizeNext, moveBar.current.oldSizePrev + changePt));
122
+ old[moveBar.current.index] = Math.max(0, Math.min(moveBar.current.oldSizePrev + moveBar.current.oldSizeNext, moveBar.current.oldSizeNext - changePt));
123
+ onResize === null || onResize === void 0 ? void 0 : onResize(old);
124
+ setCacheSizes([]);
119
125
  moveBar.current.index = -1;
120
- onResize === null || onResize === void 0 ? void 0 : onResize(cacheSizesRef.current);
121
126
  }
122
127
  }),
123
128
  _onMouseDown = _useMouseMove.onMouseDown,
@@ -10,7 +10,19 @@
10
10
  flex: 0 0 0;
11
11
  .ss-splitter-bar-dragger {
12
12
  position: relative;
13
- background-color: #f0f0f0;
13
+ &::before {
14
+ display: block;
15
+ content: '';
16
+ width: 100%;
17
+ height: 100%;
18
+ background-color: #f0f0f0;
19
+ }
20
+ &:hover {
21
+ background-color: var(--ant-primary-2, #e6f7ff);
22
+ &::before {
23
+ background-color: transparent;
24
+ }
25
+ }
14
26
  }
15
27
  }
16
28
  .ss-splitter-panel {
@@ -23,9 +35,14 @@
23
35
  .ss-splitter-bar-dragger {
24
36
  cursor: row-resize;
25
37
  width: 100%;
26
- height: 2px;
27
- top: -1px;
38
+ height: 6px;
39
+ top: -3px;
40
+ box-sizing: border-box;
41
+ padding: 2px 0;
28
42
  left: 0;
43
+ &::before {
44
+ height: 2px;
45
+ }
29
46
  }
30
47
  }
31
48
  .ss-splitter-panel {
@@ -39,9 +56,14 @@
39
56
  .ss-splitter-bar-dragger {
40
57
  cursor: col-resize;
41
58
  height: 100%;
42
- width: 2px;
43
- left: -1px;
59
+ width: 6px;
60
+ left: -3px;
61
+ box-sizing: border-box;
62
+ padding: 0 2px;
44
63
  top: 0;
64
+ &::before {
65
+ width: 2px;
66
+ }
45
67
  }
46
68
  }
47
69
  .ss-splitter-panel {
@@ -11,13 +11,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
11
11
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
12
12
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
13
13
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } /* eslint-disable no-plusplus */
14
- var useSizes = function useSizes(panelPropList) {
15
- var containerSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
16
- var propSizes = (0, _react.useMemo)(function () {
17
- return panelPropList.map(function (el) {
18
- return el.size;
19
- });
20
- }, [panelPropList]);
14
+ var useSizes = function useSizes(panelPropList, propSizes) {
15
+ var containerSize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
21
16
  var _useState = (0, _react.useState)(function () {
22
17
  return panelPropList.map(function (el) {
23
18
  return el.defaultSize;
@@ -30,16 +30,23 @@ var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
30
30
  var _react = _interopRequireWildcard(require("react"));
31
31
  var _icons = require("@ant-design/icons");
32
32
  var _classnames = _interopRequireDefault(require("classnames"));
33
- var _virtuallistAntd = require("virtuallist-antd");
34
33
  var _loading = _interopRequireDefault(require("../loading"));
35
34
  var _comsMap = _interopRequireWildcard(require("./coms-map"));
36
35
  var _interface = require("./interface");
37
36
  require("./index.less");
38
37
  var _excluded = ["columns", "dataSource", "cellClassName", "comsMap", "checkable", "selectedRowKeys", "onSelectAll", "onSelect", "primaryKey", "onPageChange", "onEmit", "scroll", "size", "virtuallistParams", "fixFirstColumn"],
39
- _excluded2 = ["name", "label", "width", "uiType", "className", "props", "cell", "render", "help", "fixed", "children"];
38
+ _excluded2 = ["name", "label", "width", "uiType", "className", "props", "cell", "render", "help", "fixed", "children"],
39
+ _excluded3 = ["children"],
40
+ _excluded4 = ["children"];
40
41
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
41
42
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
42
43
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
44
+ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
45
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
46
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
47
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
48
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
49
+ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
43
50
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
44
51
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
45
52
  function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -218,21 +225,119 @@ function CFTable(_ref2) {
218
225
  };
219
226
  }
220
227
  }, [columns]);
221
- var VcComponent = (0, _react.useMemo)(function () {
222
- if (virtuallistParams) {
223
- return (0, _virtuallistAntd.VList)({
224
- height: virtuallistParams === null || virtuallistParams === void 0 ? void 0 : virtuallistParams.height,
225
- resetTopWhenDataChange: false
226
- });
227
- }
228
- }, [virtuallistParams === null || virtuallistParams === void 0 ? void 0 : virtuallistParams.height]);
229
228
  var finalScroll = _objectSpread(_objectSpread({}, _scroll), scroll || {});
229
+ var scrollTopRef = (0, _react.useRef)(0);
230
+ var VirtualTableContext = /*#__PURE__*/(0, _react.createContext)({
231
+ childrenLen: 0,
232
+ scrollTop: 0,
233
+ startRowIndex: 0,
234
+ startOffset: 0,
235
+ endRowIndex: 0,
236
+ dispatch: function dispatch(params) {}
237
+ });
238
+ var VcComponent = (0, _react.useMemo)(function () {
239
+ return {
240
+ table: function table(_ref4) {
241
+ var tableChildren = _ref4.children,
242
+ restProps = _objectWithoutProperties(_ref4, _excluded3);
243
+ var _useState = (0, _react.useState)(0),
244
+ _useState2 = _slicedToArray(_useState, 2),
245
+ childrenLen = _useState2[0],
246
+ setChildrenLen = _useState2[1];
247
+ var _useState3 = (0, _react.useState)(scrollTopRef.current),
248
+ _useState4 = _slicedToArray(_useState3, 2),
249
+ scrollTop = _useState4[0],
250
+ setScrollTop = _useState4[1];
251
+ var scrollChildRef = (0, _react.useRef)(null);
252
+ var _useMemo = (0, _react.useMemo)(function () {
253
+ var _virtuallistParams$he;
254
+ var rowHeight = (_virtuallistParams$he = virtuallistParams === null || virtuallistParams === void 0 ? void 0 : virtuallistParams.height) !== null && _virtuallistParams$he !== void 0 ? _virtuallistParams$he : 40;
255
+ var startRowIndex = Math.floor(scrollTop / rowHeight);
256
+ var startOffset = scrollTop - startRowIndex * rowHeight;
257
+ var endRowIndex = Math.ceil((scrollTop + finalScroll.y) / rowHeight);
258
+ return [startRowIndex, startOffset, endRowIndex];
259
+ }, [scrollTop, virtuallistParams === null || virtuallistParams === void 0 ? void 0 : virtuallistParams.height, finalScroll.y]),
260
+ _useMemo2 = _slicedToArray(_useMemo, 3),
261
+ startRowIndex = _useMemo2[0],
262
+ startOffset = _useMemo2[1],
263
+ endRowIndex = _useMemo2[2];
264
+ var dispatch = function dispatch(_ref5) {
265
+ var type = _ref5.type,
266
+ payload = _ref5.payload;
267
+ switch (type) {
268
+ case 'childrenLen':
269
+ setChildrenLen(payload);
270
+ break;
271
+ case 'scrollTop':
272
+ setScrollTop(payload);
273
+ break;
274
+ }
275
+ };
276
+ var onVirtualScroll = function onVirtualScroll(e) {
277
+ scrollTopRef.current = e.target.scrollTop;
278
+ setScrollTop(e.target.scrollTop);
279
+ };
280
+ (0, _react.useEffect)(function () {
281
+ var _scrollChildRef$curre;
282
+ var scrollEle = (_scrollChildRef$curre = scrollChildRef.current) === null || _scrollChildRef$curre === void 0 ? void 0 : _scrollChildRef$curre.parentNode;
283
+ if (scrollEle) {
284
+ scrollEle.scrollTop = scrollTopRef.current;
285
+ scrollEle.addEventListener('scroll', onVirtualScroll);
286
+ }
287
+ return function () {
288
+ if (scrollEle) {
289
+ scrollEle.removeEventListener('scroll', onVirtualScroll);
290
+ }
291
+ };
292
+ }, []);
293
+ return /*#__PURE__*/_react.default.createElement(VirtualTableContext.Provider, {
294
+ value: {
295
+ childrenLen: childrenLen,
296
+ scrollTop: scrollTop,
297
+ startRowIndex: startRowIndex,
298
+ startOffset: startOffset,
299
+ endRowIndex: endRowIndex,
300
+ dispatch: dispatch
301
+ }
302
+ }, /*#__PURE__*/_react.default.createElement("div", {
303
+ ref: scrollChildRef,
304
+ style: {
305
+ boxSizing: 'border-box',
306
+ height: ((virtuallistParams === null || virtuallistParams === void 0 ? void 0 : virtuallistParams.height) || 40) * childrenLen,
307
+ paddingTop: scrollTop
308
+ }
309
+ }, /*#__PURE__*/_react.default.createElement("table", _extends({}, restProps, {
310
+ style: _objectSpread(_objectSpread({}, restProps.style || {}), {}, {
311
+ minWidth: '100%',
312
+ tableLayout: 'fixed',
313
+ width: finalScroll.x,
314
+ transform: "translateY(-".concat(startOffset, "px)")
315
+ })
316
+ }), tableChildren)));
317
+ },
318
+ body: {
319
+ wrapper: function wrapper(_ref6) {
320
+ var wrapperChildren = _ref6.children,
321
+ restProps = _objectWithoutProperties(_ref6, _excluded4);
322
+ var _useContext = (0, _react.useContext)(VirtualTableContext),
323
+ dispatch = _useContext.dispatch,
324
+ startRowIndex = _useContext.startRowIndex,
325
+ endRowIndex = _useContext.endRowIndex;
326
+ (0, _react.useEffect)(function () {
327
+ var _wrapperChildren$1$le, _wrapperChildren$;
328
+ dispatch({
329
+ type: 'childrenLen',
330
+ payload: (_wrapperChildren$1$le = wrapperChildren === null || wrapperChildren === void 0 ? void 0 : (_wrapperChildren$ = wrapperChildren[1]) === null || _wrapperChildren$ === void 0 ? void 0 : _wrapperChildren$.length) !== null && _wrapperChildren$1$le !== void 0 ? _wrapperChildren$1$le : 0
331
+ });
332
+ }, [wrapperChildren]);
333
+ return /*#__PURE__*/_react.default.createElement("tbody", restProps, wrapperChildren[0], wrapperChildren[1].slice(startRowIndex, endRowIndex));
334
+ }
335
+ }
336
+ };
337
+ }, []);
230
338
  return /*#__PURE__*/_react.default.createElement(_table.default, _extends({
231
339
  components: virtuallistParams ? VcComponent : undefined,
232
- scroll: virtuallistParams ? {
233
- x: finalScroll === null || finalScroll === void 0 ? void 0 : finalScroll.x,
234
- y: virtuallistParams.height
235
- } : finalScroll,
340
+ scroll: finalScroll,
236
341
  dataSource: dataSource,
237
342
  loadingComponent: renderLoading,
238
343
  rowKey: primaryKey,
@@ -165,6 +165,7 @@ var withTableButtonFeatures = (0, _recompose.mapProps)(function (_ref) {
165
165
  batchProps: nextBatchProps,
166
166
  tableProps: tableProps,
167
167
  formProps: formProps && _objectSpread(_objectSpread({}, formProps), {}, {
168
+ dataSource: typeof formProps.formItemsFormat === 'function' ? formProps.formItemsFormat(tableProps, formProps.dataSource) : formProps.dataSource,
168
169
  request: formProps.request && produceRequest(formProps.request),
169
170
  initialValuesRequest: formProps.initialValuesRequest && produceRequest(formProps.initialValuesRequest),
170
171
  onError: nextOnError,
package/lib/index.js CHANGED
@@ -136,6 +136,12 @@ Object.defineProperty(exports, "Splitter", {
136
136
  return _splitter.default;
137
137
  }
138
138
  });
139
+ Object.defineProperty(exports, "SwitchText", {
140
+ enumerable: true,
141
+ get: function get() {
142
+ return _switchText.default;
143
+ }
144
+ });
139
145
  var _composeManage = _interopRequireWildcard(require("./components/compose-manage"));
140
146
  var _composeTab = _interopRequireWildcard(require("./components/compose-tab"));
141
147
  var _composeTree = _interopRequireWildcard(require("./components/compose-tree"));
@@ -148,6 +154,7 @@ var _datePick = require("./components/compose-form/mod/datePick");
148
154
  var _customSelect = _interopRequireDefault(require("./components/compose-form/mod/custom-select"));
149
155
  var _FormConfirm = _interopRequireDefault(require("./components/FormConfirm"));
150
156
  var _splitter = _interopRequireDefault(require("./components/splitter"));
157
+ var _switchText = _interopRequireDefault(require("./components/compose-form/mod/switch-text"));
151
158
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
152
159
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
153
160
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "ds-web-all",
4
- "version": "1.0.1-beta.21",
4
+ "version": "1.0.1-beta.23",
5
5
  "scripts": {
6
6
  "start": "cross-env BUILD_ENV=dev && dumi dev",
7
7
  "docs:build": "cross-env BUILD_ENV=production && dumi build",
@@ -67,7 +67,6 @@
67
67
  "runes": "^0.4.3",
68
68
  "store2": "^2.13.2",
69
69
  "typescript": "^4.2.3",
70
- "virtuallist-antd": "^0.8.0-beta.1",
71
70
  "wangeditor": "^4.7.15"
72
71
  },
73
72
  "devDependencies": {
@@ -77,6 +76,7 @@
77
76
  "@types/qs": "^6.9.7",
78
77
  "@types/react-redux": "^7.1.9",
79
78
  "@types/react-router-dom": "^5.1.5",
79
+ "@types/react-window": "^1.8.8",
80
80
  "@types/recompose": "^0.30.7",
81
81
  "@umijs/plugin-locale": "^0.14.2",
82
82
  "@umijs/test": "^3.0.5",