@teamias/rex-design 0.0.42 → 0.1.0

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.
@@ -188,8 +188,8 @@ export var ProFormDateRangePickerV2 = function ProFormDateRangePickerV2(_ref) {
188
188
  }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
189
189
  value: startValue && endValue ? [dayjs(startValue), dayjs(endValue)] : undefined,
190
190
  onChange: function onChange(dates, dateStrings) {
191
- form.setFieldValue(startFieldName, dateStrings[0] || undefined);
192
- form.setFieldValue(endFieldName, dateStrings[1] || undefined);
191
+ form.setFieldValue(startFieldName, (dateStrings === null || dateStrings === void 0 ? void 0 : dateStrings[0]) || undefined);
192
+ form.setFieldValue(endFieldName, (dateStrings === null || dateStrings === void 0 ? void 0 : dateStrings[1]) || undefined);
193
193
  setTimeout(function () {
194
194
  validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
195
195
  }, 0);
@@ -35,9 +35,8 @@ export default (function () {
35
35
  }]
36
36
  }, {
37
37
  field: ['avg_cost_min', 'avg_cost_max'],
38
- valueType: 'inputNumberRange',
38
+ valueType: 'inputNumberRangeV2'
39
39
  // "itemWidth": "150px",
40
- fieldProps: []
41
40
  }],
42
41
  hidden: false
43
42
  }, {
@@ -91,7 +90,7 @@ export default (function () {
91
90
  }
92
91
  }
93
92
  // {
94
- // valueType: 'inputNumberRange',
93
+ // valueType: 'inputNumberRangeV2',
95
94
  // field: ['multipleComponents-min', 'multipleComponents-max'],
96
95
  // defaultValue: [2, 5],
97
96
  // },
@@ -105,7 +104,7 @@ export default (function () {
105
104
  // ],
106
105
  // },
107
106
  // {
108
- // valueType: 'dateRange',
107
+ // valueType: 'dateRangeV2',
109
108
  // field: ['multipleComponents-start', 'multipleComponents-end'],
110
109
  // },
111
110
  ]
@@ -138,8 +137,8 @@ export default (function () {
138
137
  }
139
138
  }, {
140
139
  valueType: 'dateRangeV2',
141
- field: ['dateRange-start', 'dateRange-end'],
142
- label: 'dateRange',
140
+ field: ['dateRangeV2-start', 'dateRangeV2-end'],
141
+ label: 'dateRangeV2',
143
142
  defaultValue: -29,
144
143
  required: true,
145
144
  fieldProps: {
@@ -205,9 +204,9 @@ export default (function () {
205
204
  label: 'inputNumber',
206
205
  defaultValue: 2
207
206
  }, {
208
- valueType: 'inputNumberRange',
209
- field: ['inputNumberRange-min', 'inputNumberRange-max'],
210
- label: 'inputNumberRange',
207
+ valueType: 'inputNumberRangeV2',
208
+ field: ['inputNumberRangeV2-min', 'inputNumberRangeV2-max'],
209
+ label: 'inputNumberRangeV2',
211
210
  defaultValue: [2, 5]
212
211
  }, {
213
212
  valueType: 'textArea',
@@ -7,6 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
7
7
  import enUS from "../../../locales/en-US.json";
8
8
  import { ProForm } from '@ant-design/pro-components';
9
9
  import { RexProConfigProvider, useStateData } from "../../..";
10
+ import { Input } from 'antd';
10
11
  import { crush } from 'radash';
11
12
  import { createIntl } from 'react-intl';
12
13
  import { BaseForm } from "../core";
@@ -24,13 +25,25 @@ export default (function () {
24
25
  valueType: 'hidden',
25
26
  field: 'www.hidden',
26
27
  initialValue: 'I am hidden'
28
+ }, {
29
+ valueType: 'custom',
30
+ field: 'www.custom',
31
+ render: function render(itemProps) {
32
+ return /*#__PURE__*/_jsx(Input, {
33
+ value: itemProps.value,
34
+ onChange: itemProps.onChange
35
+ });
36
+ }
27
37
  }, {
28
38
  valueType: 'multipleComponents',
29
39
  compact: false,
30
40
  label: '尺寸',
31
41
  subItems: [{
32
42
  valueType: 'input',
33
- field: 'www.multipleComponents-input'
43
+ field: 'www.multipleComponents-input',
44
+ fieldProps: {
45
+ // placeholder: '请输入内容',
46
+ }
34
47
  }, {
35
48
  valueType: 'input',
36
49
  field: 'www.multipleComponents-input123',
@@ -99,7 +99,7 @@ export default (function () {
99
99
  }
100
100
  }
101
101
  // {
102
- // valueType: 'inputNumberRange',
102
+ // valueType: 'inputNumberRangeV2',
103
103
  // field: ['multipleComponents-min', 'multipleComponents-max'],
104
104
  // defaultValue: [2, 5],
105
105
  // },
@@ -113,7 +113,7 @@ export default (function () {
113
113
  // ],
114
114
  // },
115
115
  // {
116
- // valueType: 'dateRange',
116
+ // valueType: 'dateRangeV2',
117
117
  // field: ['multipleComponents-start', 'multipleComponents-end'],
118
118
  // },
119
119
  ],
@@ -151,8 +151,8 @@ export default (function () {
151
151
  }
152
152
  }, {
153
153
  valueType: 'dateRangeV2',
154
- field: ['dateRange-start', 'dateRange-end'],
155
- label: 'dateRange',
154
+ field: ['dateRangeV2-start', 'dateRangeV2-end'],
155
+ label: 'dateRangeV2',
156
156
  defaultValue: -29,
157
157
  required: true,
158
158
  fieldProps: {
@@ -213,9 +213,9 @@ export default (function () {
213
213
  label: 'inputNumber',
214
214
  defaultValue: 2
215
215
  }, {
216
- valueType: 'inputNumberRange',
217
- field: ['inputNumberRange-min', 'inputNumberRange-max'],
218
- label: 'inputNumberRange',
216
+ valueType: 'inputNumberRangeV2',
217
+ field: ['inputNumberRangeV2-min', 'inputNumberRangeV2-max'],
218
+ label: 'inputNumberRangeV2',
219
219
  defaultValue: [2, 5]
220
220
  }, {
221
221
  valueType: 'textArea',
@@ -254,7 +254,7 @@ export default (function () {
254
254
  valueType: 'select',
255
255
  field: 'org_id',
256
256
  label: '部门',
257
- itemWidth: '200px',
257
+ // itemWidth: '200px',
258
258
  options: [{
259
259
  label: '1',
260
260
  value: '1'
@@ -269,7 +269,7 @@ export default (function () {
269
269
  valueType: 'select',
270
270
  field: 'job_id',
271
271
  label: '岗位',
272
- itemWidth: '200px',
272
+ // itemWidth: '200px',
273
273
  options: [{
274
274
  label: '1',
275
275
  value: '1'
@@ -1,3 +1,4 @@
1
+ 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); }
1
2
  var _excluded = ["valueType", "label", "defaultValue", "childWidths", "fieldProps", "formItemProps", "params", "defaultParams"],
2
3
  _excluded2 = ["formItemProps", "fieldProps"],
3
4
  _excluded3 = ["formItemProps", "fieldProps", "name"],
@@ -9,7 +10,6 @@ var _excluded = ["valueType", "label", "defaultValue", "childWidths", "fieldProp
9
10
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
10
11
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
11
12
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
12
- 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); }
13
13
  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; }
14
14
  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; }
15
15
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -98,7 +98,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
98
98
  placeholder: label && inlineLabelStatus ? "".concat(placeholderPrefix).concat(label) : placeholderPrefix
99
99
  };
100
100
  var config = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultInject ? commonProps : {}), localConfig), defaultInject ? otherProps : {}), {}, {
101
- fieldProps: _objectSpread(_objectSpread({}, 'fieldProps' in localConfig && _typeof(localConfig.fieldProps) === 'object' ? localConfig.fieldProps : {}), defaultInject ? rawFieldProps : {})
101
+ fieldProps: _objectSpread(_objectSpread({}, localConfig.fieldProps), defaultInject ? rawFieldProps : {})
102
102
  }, defaultInject ? {
103
103
  formItemProps: _objectSpread(_objectSpread({}, rawFormItemProps), {}, {
104
104
  className: 'base-form-item',
@@ -134,14 +134,12 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
134
134
  };
135
135
  if (valueType === 'custom') {
136
136
  var _getMergeConfig = getMergeConfig({
137
- name: keyStr
137
+ name: splitKeyStr(keyStr)
138
138
  }),
139
139
  formItemProps = _getMergeConfig.formItemProps,
140
140
  fieldProps = _getMergeConfig.fieldProps,
141
141
  otherConfigProps = _objectWithoutProperties(_getMergeConfig, _excluded2);
142
- return /*#__PURE__*/_createElement(ProFormItemRender, _objectSpread(_objectSpread(_objectSpread({
143
- name: splitKeyStr(keyStr)
144
- }, otherConfigProps), formItemProps), {}, {
142
+ return /*#__PURE__*/_createElement(ProFormItemRender, _objectSpread(_objectSpread(_objectSpread({}, otherConfigProps), formItemProps), {}, {
145
143
  key: keyStr
146
144
  }), function (customItemProps) {
147
145
  return otherProps === null || otherProps === void 0 ? void 0 : otherProps.render(customItemProps, form);
@@ -1,5 +1,5 @@
1
1
  import styled, { createGlobalStyle } from 'styled-components';
2
- var compactArr = ['ant-input-outlined', 'ant-select-selector', 'ant-picker', 'ant-input-number-outlined'];
2
+ var compactArr = ['ant-input-outlined', 'ant-select', 'ant-select-selector', 'ant-picker', 'ant-input-number-outlined'];
3
3
  export var BaseFormStyle = createGlobalStyle([".base-form-field-group{display:flex !important;}.base-form-field-multiple-group{display:flex;width:100%;gap:8px;}.base-form-field-multiple-group.compact{gap:0;", "{border-top-left-radius:0;border-bottom-left-radius:0;border-left-color:transparent;}", "{border-top-right-radius:0;border-bottom-right-radius:0;}}.base-form-item{width:var(--item-width);.ant-form-item-label:has(label[title]){width:var(--label-width);}.ant-picker{width:100%;}.ant-space-compact{width:100%;}}"], compactArr.map(function (str) {
4
4
  return "> div:not(:first-child) .".concat(str);
5
5
  }).join(','), compactArr.map(function (str) {
@@ -33,10 +33,14 @@ export type TMultipleComponentsProps = IBaseFormFieldItem<'multipleComponents'>
33
33
  /** 组合模式,紧凑型 */
34
34
  compact?: boolean;
35
35
  formItemProps?: GetProps<typeof Form.Item>;
36
+ /** 假的,没效果 */
37
+ fieldProps?: unknown;
36
38
  };
37
39
  export type TCustomProps = IBaseFormFieldItem<'custom'> & GetProps<typeof Form.Item> & {
38
40
  render: (props: Parameters<GetProps<typeof ProFormItemRender>['children']>[0], form?: ReturnType<typeof ProForm.useForm>[0]) => ReactNode;
39
41
  formItemProps?: GetProps<typeof Form.Item>;
42
+ /** 假的,没效果 */
43
+ fieldProps?: unknown;
40
44
  };
41
45
  /** 组件 基础fields 类型 */
42
46
  export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
@@ -106,11 +110,6 @@ export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
106
110
  params?: Record<string, unknown>;
107
111
  /** 多选 */
108
112
  multiple?: boolean;
109
- /**
110
- * 对应 valueType 的props
111
- * - TODO: 不清楚怎么设置这个泛型
112
- */
113
- fieldProps?: unknown;
114
113
  /** 校验规则 */
115
114
  rules?: Array<{
116
115
  required?: boolean;
@@ -12,9 +12,25 @@ import classNames from 'classnames';
12
12
  import React from 'react';
13
13
  import { DataCell } from "../../data-cell/data-cell";
14
14
  import { TableParentRow, TableParentRowCell } from "../style";
15
+
16
+ /**
17
+ * 判断是否为左侧固定列
18
+ * 兼容 antd 5.x (fixLeft) 和 antd 6.x (fixStart)
19
+ */
15
20
  import { jsx as _jsx } from "react/jsx-runtime";
16
21
  import { Fragment as _Fragment } from "react/jsx-runtime";
17
22
  import { jsxs as _jsxs } from "react/jsx-runtime";
23
+ var isFixedLeft = function isFixedLeft(props) {
24
+ return typeof (props === null || props === void 0 ? void 0 : props.fixLeft) === 'number' || typeof (props === null || props === void 0 ? void 0 : props.fixStart) === 'number';
25
+ };
26
+
27
+ /**
28
+ * 判断是否为右侧固定列
29
+ * 兼容 antd 5.x (fixRight) 和 antd 6.x (fixEnd)
30
+ */
31
+ var isFixedRight = function isFixedRight(props) {
32
+ return typeof (props === null || props === void 0 ? void 0 : props.fixRight) === 'number' || typeof (props === null || props === void 0 ? void 0 : props.fixEnd) === 'number';
33
+ };
18
34
  export var BaseTableRow = function BaseTableRow(outProps) {
19
35
  var cellClick = outProps['data-cell-click-event'],
20
36
  columnCount = outProps['data-column-count'],
@@ -33,11 +49,13 @@ export var BaseTableRow = function BaseTableRow(outProps) {
33
49
  // console.log(props);
34
50
  var record = props.children[0].props.record;
35
51
  var index = props.children[0].props.index;
52
+ // 兼容 antd 5.x (fixLeft) 和 antd 6.x (fixStart)
36
53
  var leftArr = props.children.filter(function (ii) {
37
- return typeof ii.props.fixLeft === 'number';
54
+ return isFixedLeft(ii.props);
38
55
  });
56
+ // 兼容 antd 5.x (fixRight) 和 antd 6.x (fixEnd)
39
57
  var rightArr = props.children.filter(function (ii) {
40
- return typeof ii.props.fixRight === 'number';
58
+ return isFixedRight(ii.props);
41
59
  });
42
60
  /** 是否存在左边固定列 */
43
61
  var hanBeforeColumns = leftArr.filter(function (ii) {
@@ -128,7 +146,9 @@ export var BaseTableRow = function BaseTableRow(outProps) {
128
146
  children: [_dom, _dom2]
129
147
  });
130
148
  }
131
- }(), new Array(Math.max(+columnCount - 1, 0)).fill('').map(function (_, i) {
149
+ }(), Array.from({
150
+ length: Math.max(+columnCount - 1, 0)
151
+ }).map(function (_, i) {
132
152
  return /*#__PURE__*/_jsx("td", {
133
153
  "aria-hidden": "true"
134
154
  }, i);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamias/rex-design",
3
- "version": "0.0.42",
3
+ "version": "0.1.0",
4
4
  "description": "A react library developed with dumi",
5
5
  "license": "MIT",
6
6
  "module": "dist/index.js",
@@ -51,7 +51,7 @@
51
51
  "@ant-design/icons": "^6.0.0",
52
52
  "@ant-design/pro-components": "^2.8.10",
53
53
  "@ant-design/pro-form": "^2.32.0",
54
- "@iconify/react": "^6.0.0",
54
+ "@iconify/react": "^6.0.2",
55
55
  "@js-preview/pdf": "^2.0.10",
56
56
  "@tiptap/core": "^2.12.0",
57
57
  "@tiptap/extension-bullet-list": "2.12.0",
@@ -68,14 +68,16 @@
68
68
  "@tiptap/pm": "^2.12.0",
69
69
  "@tiptap/react": "^2.12.0",
70
70
  "@tiptap/starter-kit": "^2.12.0",
71
- "ahooks": "^3.9.0",
71
+ "ahooks": "^3.9.6",
72
72
  "antd": "^5.29.3",
73
73
  "classnames": "^2.5.1",
74
- "dayjs": "^1.11.13",
74
+ "dayjs": "^1.11.19",
75
75
  "lodash": "^4.17.21",
76
76
  "prosemirror-state": "^1.4.3",
77
77
  "radash": "^12.1.1",
78
78
  "rc-virtual-list": "^3.19.1",
79
+ "react": "^18.3.1",
80
+ "react-dom": "^18.3.1",
79
81
  "react-intl": "^7.1.11",
80
82
  "react-quick-pinch-zoom": "^5.1.1",
81
83
  "react-router": "6",
@@ -88,19 +90,17 @@
88
90
  "@teamias/umi-loader-source-plugin": "^0.0.11",
89
91
  "@teamias/umi-plugin-upload-build": "^0.0.2",
90
92
  "@types/lodash": "^4.17.20",
91
- "@types/react": "^18.0.0",
92
- "@types/react-dom": "^18.0.0",
93
- "@umijs/lint": "^4.0.0",
94
- "dumi": "^2.4.13",
93
+ "@types/react": "^18.3.27",
94
+ "@types/react-dom": "^18.3.7",
95
+ "@umijs/lint": "^4.6.15",
96
+ "dumi": "^2.4.21",
95
97
  "eslint": "^8.23.0",
96
- "father": "^4.1.0",
98
+ "father": "^4.6.12",
97
99
  "husky": "^8.0.1",
98
- "lint-staged": "^13.0.3",
99
- "prettier": "^2.7.1",
100
- "prettier-plugin-organize-imports": "^3.0.0",
101
- "prettier-plugin-packagejson": "^2.2.18",
102
- "react": "^18.0.0",
103
- "react-dom": "^18.0.0",
100
+ "lint-staged": "^13.3.0",
101
+ "prettier": "^3.7.4",
102
+ "prettier-plugin-organize-imports": "^4.3.0",
103
+ "prettier-plugin-packagejson": "^2.5.20",
104
104
  "stylelint": "^14.9.1"
105
105
  },
106
106
  "peerDependencies": {