@teamix/pro 1.5.36 → 1.5.38
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.
- package/dist/pro.js +483 -455
- package/dist/pro.min.js +1 -1
- package/es/form/Filter/index.js +18 -7
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/table/components/Cell/index.js +6 -2
- package/es/table/components/Layout/index.js +2 -1
- package/es/table/index.js +7 -5
- package/es/table/utils/genAutoWidthColumns.js +2 -2
- package/es/table/utils/index.d.ts +65 -1
- package/es/table/utils/index.js +1 -0
- package/es/table/utils/useTableSelection.d.ts +25 -2
- package/es/table/utils/useTableSelection.js +17 -9
- package/lib/form/Filter/index.js +18 -7
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/table/components/Cell/index.js +5 -1
- package/lib/table/components/Layout/index.js +2 -1
- package/lib/table/index.js +7 -5
- package/lib/table/utils/genAutoWidthColumns.js +2 -2
- package/lib/table/utils/index.d.ts +65 -1
- package/lib/table/utils/index.js +1 -0
- package/lib/table/utils/useTableSelection.d.ts +25 -2
- package/lib/table/utils/useTableSelection.js +16 -8
- package/package.json +1 -1
package/es/form/Filter/index.js
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
2
2
|
var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "bindUrl", "onFilter", "onInit", "onReset", "onExpand", "onChange", "form"];
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
4
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
5
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
6
3
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
7
4
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
8
5
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
9
6
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
7
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
8
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
9
|
+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
10
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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
11
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); } }
|
12
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); }); }; }
|
@@ -322,7 +322,17 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
|
|
322
322
|
}, []);
|
323
323
|
// 设置筛选数据
|
324
324
|
var configFilterItem = useCallback(function (form) {
|
325
|
-
|
325
|
+
var _getFilterDisplayValu;
|
326
|
+
filterItem.current = (_getFilterDisplayValu = getFilterDisplayValues(form)) === null || _getFilterDisplayValu === void 0 ? void 0 : _getFilterDisplayValu.map(function (item) {
|
327
|
+
var _props$schema, _props$schema$find;
|
328
|
+
// 需要找到 props 作为 proField 标签内渲染用
|
329
|
+
var schemaFieldProps = (_props$schema = props.schema) === null || _props$schema === void 0 ? void 0 : (_props$schema$find = _props$schema.find) === null || _props$schema$find === void 0 ? void 0 : _props$schema$find.call(_props$schema, function (schemaItem) {
|
330
|
+
return (item === null || item === void 0 ? void 0 : item.key) === (schemaItem === null || schemaItem === void 0 ? void 0 : schemaItem.name);
|
331
|
+
});
|
332
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
333
|
+
props: schemaFieldProps === null || schemaFieldProps === void 0 ? void 0 : schemaFieldProps.props
|
334
|
+
});
|
335
|
+
});
|
326
336
|
}, []);
|
327
337
|
// 设置标签数据
|
328
338
|
var configTag = useCallback(function () {
|
@@ -487,7 +497,8 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
|
|
487
497
|
label = _ref8.label,
|
488
498
|
value = _ref8.value,
|
489
499
|
type = _ref8.type,
|
490
|
-
index = _ref8.index
|
500
|
+
index = _ref8.index,
|
501
|
+
props = _ref8.props;
|
491
502
|
return /*#__PURE__*/React.createElement(Tag.Closeable, {
|
492
503
|
key: isNum(index) ? key + label : key,
|
493
504
|
afterClose: function afterClose() {
|
@@ -497,10 +508,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
|
|
497
508
|
className: prefixCls('tag-title')
|
498
509
|
}, label), /*#__PURE__*/React.createElement("span", {
|
499
510
|
className: prefixCls('tag-content')
|
500
|
-
}, /*#__PURE__*/React.createElement(ProField, {
|
511
|
+
}, /*#__PURE__*/React.createElement(ProField, _objectSpread({
|
501
512
|
type: type,
|
502
513
|
value: value
|
503
|
-
})));
|
514
|
+
}, props !== null && props !== void 0 ? props : {}))));
|
504
515
|
})) : null);
|
505
516
|
});
|
506
517
|
QueryFilter.defaultProps = {
|
package/es/index.d.ts
CHANGED
@@ -30,5 +30,5 @@ export * from './sidebar';
|
|
30
30
|
export * from './utils';
|
31
31
|
export * from './timeline';
|
32
32
|
export * from './image';
|
33
|
-
declare const version = "1.5.
|
33
|
+
declare const version = "1.5.38";
|
34
34
|
export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };
|
package/es/index.js
CHANGED
@@ -15,7 +15,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
15
15
|
* 渲染列的逻辑函数
|
16
16
|
*/
|
17
17
|
import React from 'react';
|
18
|
-
import { getTargetValue } from '@teamix/utils';
|
18
|
+
import { getTargetValue, _ } from '@teamix/utils';
|
19
19
|
import { ProActionGroup } from '../../../actions';
|
20
20
|
import ProField from '../../../field';
|
21
21
|
/**
|
@@ -76,7 +76,7 @@ var Cell = function Cell(props) {
|
|
76
76
|
}
|
77
77
|
}, itemProps);
|
78
78
|
}
|
79
|
-
if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
|
79
|
+
if ((render === null || render === void 0 ? void 0 : render.type) === 'step' || (render === null || render === void 0 ? void 0 : render.type) === 'groupTag') {
|
80
80
|
newRender = _objectSpread(_objectSpread({}, newRender), {}, {
|
81
81
|
ellipsis: false
|
82
82
|
});
|
@@ -200,6 +200,10 @@ var equalColumns = function equalColumns(prevProps, nextProps) {
|
|
200
200
|
if (preValue === false && nextValue === false || nextValue === undefined) {
|
201
201
|
return false;
|
202
202
|
}
|
203
|
+
// 如果不是 string 类型,全部刷新
|
204
|
+
if (!_.isString(nextValue)) {
|
205
|
+
return false;
|
206
|
+
}
|
203
207
|
if (preValue === nextValue) {
|
204
208
|
return true;
|
205
209
|
}
|
@@ -130,7 +130,7 @@ var Layout = function Layout(props) {
|
|
130
130
|
}
|
131
131
|
}, [
|
132
132
|
//todo: 重复render 问题都在这里
|
133
|
-
dataFilter, mainAction, dataFilterFormRef, afterDataFilter]);
|
133
|
+
dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection, actionRef.current]);
|
134
134
|
// 区域组合渲染
|
135
135
|
var renderLayout = function renderLayout() {
|
136
136
|
if (header && mainAction) {
|
@@ -174,4 +174,5 @@ var Layout = function Layout(props) {
|
|
174
174
|
}
|
175
175
|
return /*#__PURE__*/React.createElement(React.Fragment, null);
|
176
176
|
};
|
177
|
+
// export default Layout
|
177
178
|
export default /*#__PURE__*/React.memo(Layout);
|
package/es/table/index.js
CHANGED
@@ -422,9 +422,9 @@ var ProTable = function ProTable(props) {
|
|
422
422
|
if (showSkeleton && result) {
|
423
423
|
result.disabled = true;
|
424
424
|
}
|
425
|
-
return _objectSpread(
|
425
|
+
return _objectSpread({
|
426
426
|
_primaryKey: props.primaryKey
|
427
|
-
},
|
427
|
+
}, result);
|
428
428
|
},
|
429
429
|
titleProps: function titleProps() {
|
430
430
|
var result = {};
|
@@ -437,7 +437,7 @@ var ProTable = function ProTable(props) {
|
|
437
437
|
return result;
|
438
438
|
},
|
439
439
|
onChange: onChangeRowSelection
|
440
|
-
}), primaryKey);
|
440
|
+
}), data !== null && data !== void 0 ? data : propsDataSource, primaryKey);
|
441
441
|
var rowSelection = useRowSelection ? rowSelectionHook.rowSelection : propsRowSelection;
|
442
442
|
var selectedCount = (rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$selecte = rowSelection.selectedRowKeys) === null || _rowSelection$selecte === void 0 ? void 0 : _rowSelection$selecte.length) || 0;
|
443
443
|
useEffect(function () {
|
@@ -545,7 +545,7 @@ var ProTable = function ProTable(props) {
|
|
545
545
|
}
|
546
546
|
});
|
547
547
|
// 绑定 Actions
|
548
|
-
useActionType(actionRef, {
|
548
|
+
actionRef.current = useActionType(actionRef, {
|
549
549
|
fullScreen: function fullScreen() {
|
550
550
|
var _actionRef$current2, _actionRef$current2$s;
|
551
551
|
var state = !fullscreenState;
|
@@ -1007,7 +1007,9 @@ var ProTable = function ProTable(props) {
|
|
1007
1007
|
mainAction: mainAction,
|
1008
1008
|
extra: extra,
|
1009
1009
|
toolBar: toolBar,
|
1010
|
-
actionRef:
|
1010
|
+
actionRef: {
|
1011
|
+
current: actionRef.current
|
1012
|
+
},
|
1011
1013
|
columns: propsColumns,
|
1012
1014
|
dataFilter: dataFilter,
|
1013
1015
|
afterDataFilter: afterDataFilter,
|
@@ -61,7 +61,6 @@ export function genAutoWidthColumns(columns, ref, data, size, useRowSelection, a
|
|
61
61
|
finalColumns.push(column);
|
62
62
|
return;
|
63
63
|
}
|
64
|
-
;
|
65
64
|
if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
|
66
65
|
finalColumns.push(column);
|
67
66
|
return;
|
@@ -100,7 +99,8 @@ export function genAutoWidthColumns(columns, ref, data, size, useRowSelection, a
|
|
100
99
|
return;
|
101
100
|
}
|
102
101
|
// @ts-ignore
|
103
|
-
var titleWidth = _.get(childNodes
|
102
|
+
var titleWidth = _.get(childNodes[index], "children[0].scrollWidth", 0);
|
103
|
+
// const titleWidth = childNodes[index]?.children[0].scrollWidth
|
104
104
|
// @ts-ignore
|
105
105
|
if (fixedWidthTypeList[finalType]) {
|
106
106
|
// console.log(
|
@@ -9,7 +9,71 @@ export declare function off(key: string): void;
|
|
9
9
|
/** table 组件内触发事件 不对外暴露 */
|
10
10
|
export declare function emit(key: string, ...args: any): void;
|
11
11
|
export declare function initActionRef(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
|
12
|
-
export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType):
|
12
|
+
export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): {
|
13
|
+
fullScreen?: (() => boolean) | undefined;
|
14
|
+
setColumn?: ((newColumns: ProTableColumnProps[], update?: boolean | undefined) => void) | undefined;
|
15
|
+
size?: "medium" | "small" | undefined;
|
16
|
+
setSize?: ((mode: "medium" | "small") => void) | undefined;
|
17
|
+
refresh?: ((params?: any) => void) | undefined;
|
18
|
+
request?: ((params?: any) => void) | undefined;
|
19
|
+
reset?: (() => void) | undefined;
|
20
|
+
rowSelection?: import("..").innerRowSelectionType | ({
|
21
|
+
getProps?: ((record: any, index: number) => any) | undefined;
|
22
|
+
onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
|
23
|
+
onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
|
24
|
+
onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
|
25
|
+
selectedRowKeys?: any[] | undefined;
|
26
|
+
selectedRecords?: any[] | undefined;
|
27
|
+
mode?: "multiple" | "single" | undefined;
|
28
|
+
titleProps?: (() => any) | undefined;
|
29
|
+
columnProps?: (() => any) | undefined;
|
30
|
+
titleAddons?: (() => any) | undefined;
|
31
|
+
defaultSelectedRowKeys?: any[] | undefined;
|
32
|
+
defaultSelectedRecords?: any[] | undefined;
|
33
|
+
} & {
|
34
|
+
getProps?: ((record: any, index: number) => void) | undefined;
|
35
|
+
onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
|
36
|
+
onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
|
37
|
+
onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
|
38
|
+
selectedRowKeys?: any[] | undefined;
|
39
|
+
mode?: "multiple" | "single" | undefined;
|
40
|
+
titleProps?: (() => any) | undefined;
|
41
|
+
columnProps?: (() => any) | undefined;
|
42
|
+
titleAddons?: (() => any) | undefined;
|
43
|
+
}) | undefined;
|
44
|
+
clearRowSelection?: (() => void) | undefined;
|
45
|
+
filterDataSource?: ((dataIndex: string) => void) | undefined;
|
46
|
+
pageInfo?: {
|
47
|
+
total?: number | undefined;
|
48
|
+
current?: number | undefined;
|
49
|
+
pageSize?: number | undefined;
|
50
|
+
targetPageKey?: string | undefined;
|
51
|
+
targetPageSizeKey?: string | undefined;
|
52
|
+
} | undefined;
|
53
|
+
resetPage?: (() => void) | undefined;
|
54
|
+
nextPage?: (() => void) | undefined;
|
55
|
+
dataFilterForm?: import("../..").ProFormType | undefined;
|
56
|
+
dataFilterFormRef?: import("react").MutableRefObject<import("../..").ProFormType> | undefined;
|
57
|
+
normalDataFilterForm?: import("../..").ProFormType | undefined;
|
58
|
+
fullscreenDataFilterForm?: import("../..").ProFormType | undefined;
|
59
|
+
filterEnableRef?: any;
|
60
|
+
data?: any[] | undefined;
|
61
|
+
switchView?: ((view: "table" | "card") => void) | undefined;
|
62
|
+
setData?: ((data: any[]) => void) | undefined;
|
63
|
+
setCardViewScrollPosition?: ((scrollTop: number) => void) | undefined;
|
64
|
+
setAutoRefreshTimers?: ((timers: number) => void) | undefined;
|
65
|
+
clearAutoRefreshTimers?: (() => void) | undefined;
|
66
|
+
getState?: (() => import("..").ProTableActionTypeState) | undefined;
|
67
|
+
setState?: ((key: string, value: any) => void) | undefined;
|
68
|
+
setFullScreenState?: ((state: boolean) => void) | undefined;
|
69
|
+
on?: ((...args: any) => void) | undefined;
|
70
|
+
off?: ((...args: any) => void) | undefined;
|
71
|
+
setFilterRules?: ((rules: import("..").ProTableColumnsFilterRulesItem) => void) | undefined;
|
72
|
+
getFilterRules?: (() => object) | undefined;
|
73
|
+
resetTableMaxBodyHeight?: ((offset: number) => void) | undefined;
|
74
|
+
filterColumns?: any[] | undefined;
|
75
|
+
getCallback?: (() => any) | undefined;
|
76
|
+
};
|
13
77
|
export declare function cloneDeep<T>(obj: T): T;
|
14
78
|
/**
|
15
79
|
* 处理默认过滤参数
|
package/es/table/utils/index.js
CHANGED
@@ -92,6 +92,7 @@ export function initActionRef(ref, action) {
|
|
92
92
|
}
|
93
93
|
export function useActionType(ref, action) {
|
94
94
|
ref.current = _objectSpread(_objectSpread({}, ref.current), action);
|
95
|
+
return _objectSpread(_objectSpread({}, ref.current), action);
|
95
96
|
}
|
96
97
|
export function cloneDeep(obj) {
|
97
98
|
return cloneDeepLodash(obj);
|
@@ -1,3 +1,26 @@
|
|
1
|
-
import {
|
2
|
-
declare function useTableSelection(config
|
1
|
+
import { innerRowSelectionType } from '../typing';
|
2
|
+
declare function useTableSelection(config: ({
|
3
|
+
getProps?: ((record: any, index: number) => any) | undefined;
|
4
|
+
onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
|
5
|
+
onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
|
6
|
+
onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
|
7
|
+
selectedRowKeys?: any[] | undefined;
|
8
|
+
selectedRecords?: any[] | undefined;
|
9
|
+
mode?: "multiple" | "single" | undefined;
|
10
|
+
titleProps?: (() => any) | undefined;
|
11
|
+
columnProps?: (() => any) | undefined;
|
12
|
+
titleAddons?: (() => any) | undefined;
|
13
|
+
defaultSelectedRowKeys?: any[] | undefined;
|
14
|
+
defaultSelectedRecords?: any[] | undefined;
|
15
|
+
} & {
|
16
|
+
getProps?: ((record: any, index: number) => void) | undefined;
|
17
|
+
onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
|
18
|
+
onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
|
19
|
+
onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
|
20
|
+
selectedRowKeys?: any[] | undefined;
|
21
|
+
mode?: "multiple" | "single" | undefined;
|
22
|
+
titleProps?: (() => any) | undefined;
|
23
|
+
columnProps?: (() => any) | undefined;
|
24
|
+
titleAddons?: (() => any) | undefined;
|
25
|
+
}) | undefined, records: any, primaryKey?: string): innerRowSelectionType;
|
3
26
|
export default useTableSelection;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
var _excluded = ["primaryKey"];
|
1
|
+
var _excluded = ["primaryKey", "_primaryKey"];
|
2
2
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
3
3
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
4
4
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
@@ -18,18 +18,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
18
18
|
* 处理表格 rowSelection hooks
|
19
19
|
* 除了基本 rowSelection 之外返回平铺后的 selectedRowKeys、selectedRecords
|
20
20
|
*/
|
21
|
-
import React, { useState } from 'react';
|
21
|
+
import React, { useEffect, useState } from 'react';
|
22
22
|
import { getDeepValue } from '@teamix/utils';
|
23
23
|
import { Balloon, Checkbox } from '@alicloudfe/components';
|
24
24
|
var Tooltip = Balloon.Tooltip;
|
25
25
|
function useTableSelection() {
|
26
26
|
var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
27
|
-
var
|
27
|
+
var records = arguments.length > 1 ? arguments[1] : undefined;
|
28
|
+
var primaryKey = arguments.length > 2 ? arguments[2] : undefined;
|
28
29
|
var _config$defaultSelect = config.defaultSelectedRecords,
|
29
30
|
defaultSelectedRecords = _config$defaultSelect === void 0 ? [] : _config$defaultSelect,
|
30
31
|
_config$defaultSelect2 = config.defaultSelectedRowKeys,
|
31
32
|
defaultSelectedRowKeys = _config$defaultSelect2 === void 0 ? [] : _config$defaultSelect2;
|
32
|
-
var _useState = useState(defaultSelectedRowKeys),
|
33
|
+
var _useState = useState(config.selectedRowKeys || defaultSelectedRowKeys),
|
33
34
|
_useState2 = _slicedToArray(_useState, 2),
|
34
35
|
selectedRowKeys = _useState2[0],
|
35
36
|
setSelectedRowKeys = _useState2[1];
|
@@ -37,6 +38,10 @@ function useTableSelection() {
|
|
37
38
|
_useState4 = _slicedToArray(_useState3, 2),
|
38
39
|
selectedRecords = _useState4[0],
|
39
40
|
setSelectedRecords = _useState4[1];
|
41
|
+
useEffect(function () {
|
42
|
+
var _config$selectedRowKe;
|
43
|
+
setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
|
44
|
+
}, [config.selectedRowKeys]);
|
40
45
|
function _onChange(value, records) {
|
41
46
|
if (primaryKey) {
|
42
47
|
var newValue = value.filter(function (v) {
|
@@ -72,18 +77,21 @@ function useTableSelection() {
|
|
72
77
|
config.onChange(value, records);
|
73
78
|
}
|
74
79
|
}
|
75
|
-
var renderCheckBox = function renderCheckBox(props) {
|
80
|
+
var renderCheckBox = function renderCheckBox(props, record) {
|
76
81
|
var primaryKey = props.primaryKey,
|
82
|
+
_primaryKey = props._primaryKey,
|
77
83
|
others = _objectWithoutProperties(props, _excluded);
|
78
84
|
return /*#__PURE__*/React.createElement(Checkbox, _objectSpread({
|
79
85
|
checked: selectedRowKeys.includes(primaryKey),
|
80
86
|
onChange: function onChange(checked) {
|
87
|
+
var _config$onSelect;
|
88
|
+
config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
|
81
89
|
if (checked) {
|
82
|
-
_onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [
|
90
|
+
_onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
|
83
91
|
} else {
|
84
92
|
_onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
|
85
93
|
return item !== primaryKey;
|
86
|
-
}), [
|
94
|
+
}), [record]);
|
87
95
|
}
|
88
96
|
}
|
89
97
|
}, others));
|
@@ -104,13 +112,13 @@ function useTableSelection() {
|
|
104
112
|
return /*#__PURE__*/React.createElement(Tooltip, {
|
105
113
|
trigger: renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
|
106
114
|
primaryKey: primaryKey
|
107
|
-
})),
|
115
|
+
}), record),
|
108
116
|
align: "t"
|
109
117
|
}, propResult.disabledTooltip);
|
110
118
|
}
|
111
119
|
return renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
|
112
120
|
primaryKey: primaryKey
|
113
|
-
}));
|
121
|
+
}), record);
|
114
122
|
}
|
115
123
|
});
|
116
124
|
};
|
package/lib/form/Filter/index.js
CHANGED
@@ -31,13 +31,13 @@ var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "fo
|
|
31
31
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
32
32
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
33
33
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
34
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
35
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
36
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
37
34
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
38
35
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
39
36
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
40
37
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
38
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
39
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
40
|
+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
41
41
|
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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
42
42
|
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); } }
|
43
43
|
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); }); }; }
|
@@ -337,7 +337,17 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
337
337
|
}, []);
|
338
338
|
// 设置筛选数据
|
339
339
|
var configFilterItem = (0, _react.useCallback)(function (form) {
|
340
|
-
|
340
|
+
var _getFilterDisplayValu;
|
341
|
+
filterItem.current = (_getFilterDisplayValu = getFilterDisplayValues(form)) === null || _getFilterDisplayValu === void 0 ? void 0 : _getFilterDisplayValu.map(function (item) {
|
342
|
+
var _props$schema, _props$schema$find;
|
343
|
+
// 需要找到 props 作为 proField 标签内渲染用
|
344
|
+
var schemaFieldProps = (_props$schema = props.schema) === null || _props$schema === void 0 ? void 0 : (_props$schema$find = _props$schema.find) === null || _props$schema$find === void 0 ? void 0 : _props$schema$find.call(_props$schema, function (schemaItem) {
|
345
|
+
return (item === null || item === void 0 ? void 0 : item.key) === (schemaItem === null || schemaItem === void 0 ? void 0 : schemaItem.name);
|
346
|
+
});
|
347
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
348
|
+
props: schemaFieldProps === null || schemaFieldProps === void 0 ? void 0 : schemaFieldProps.props
|
349
|
+
});
|
350
|
+
});
|
341
351
|
}, []);
|
342
352
|
// 设置标签数据
|
343
353
|
var configTag = (0, _react.useCallback)(function () {
|
@@ -502,7 +512,8 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
502
512
|
label = _ref8.label,
|
503
513
|
value = _ref8.value,
|
504
514
|
type = _ref8.type,
|
505
|
-
index = _ref8.index
|
515
|
+
index = _ref8.index,
|
516
|
+
props = _ref8.props;
|
506
517
|
return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
|
507
518
|
key: (0, _utils.isNum)(index) ? key + label : key,
|
508
519
|
afterClose: function afterClose() {
|
@@ -512,10 +523,10 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
512
523
|
className: prefixCls('tag-title')
|
513
524
|
}, label), /*#__PURE__*/_react.default.createElement("span", {
|
514
525
|
className: prefixCls('tag-content')
|
515
|
-
}, /*#__PURE__*/_react.default.createElement(_index.default, {
|
526
|
+
}, /*#__PURE__*/_react.default.createElement(_index.default, _objectSpread({
|
516
527
|
type: type,
|
517
528
|
value: value
|
518
|
-
})));
|
529
|
+
}, props !== null && props !== void 0 ? props : {}))));
|
519
530
|
})) : null);
|
520
531
|
});
|
521
532
|
exports.QueryFilter = QueryFilter;
|
package/lib/index.d.ts
CHANGED
@@ -30,5 +30,5 @@ export * from './sidebar';
|
|
30
30
|
export * from './utils';
|
31
31
|
export * from './timeline';
|
32
32
|
export * from './image';
|
33
|
-
declare const version = "1.5.
|
33
|
+
declare const version = "1.5.38";
|
34
34
|
export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };
|
package/lib/index.js
CHANGED
@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
299
299
|
if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
|
300
300
|
_icon.default.setConfig(_utils.default.getTeamixIconConfig());
|
301
301
|
}
|
302
|
-
var version = '1.5.
|
302
|
+
var version = '1.5.38';
|
303
303
|
// By TeamixTest
|
304
304
|
exports.version = version;
|
305
305
|
window.postMessage({
|
@@ -80,7 +80,7 @@ var Cell = function Cell(props) {
|
|
80
80
|
}
|
81
81
|
}, itemProps);
|
82
82
|
}
|
83
|
-
if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
|
83
|
+
if ((render === null || render === void 0 ? void 0 : render.type) === 'step' || (render === null || render === void 0 ? void 0 : render.type) === 'groupTag') {
|
84
84
|
newRender = _objectSpread(_objectSpread({}, newRender), {}, {
|
85
85
|
ellipsis: false
|
86
86
|
});
|
@@ -204,6 +204,10 @@ var equalColumns = function equalColumns(prevProps, nextProps) {
|
|
204
204
|
if (preValue === false && nextValue === false || nextValue === undefined) {
|
205
205
|
return false;
|
206
206
|
}
|
207
|
+
// 如果不是 string 类型,全部刷新
|
208
|
+
if (!_utils._.isString(nextValue)) {
|
209
|
+
return false;
|
210
|
+
}
|
207
211
|
if (preValue === nextValue) {
|
208
212
|
return true;
|
209
213
|
}
|
@@ -139,7 +139,7 @@ var Layout = function Layout(props) {
|
|
139
139
|
}
|
140
140
|
}, [
|
141
141
|
//todo: 重复render 问题都在这里
|
142
|
-
dataFilter, mainAction, dataFilterFormRef, afterDataFilter]);
|
142
|
+
dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection, actionRef.current]);
|
143
143
|
// 区域组合渲染
|
144
144
|
var renderLayout = function renderLayout() {
|
145
145
|
if (header && mainAction) {
|
@@ -183,5 +183,6 @@ var Layout = function Layout(props) {
|
|
183
183
|
}
|
184
184
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
|
185
185
|
};
|
186
|
+
// export default Layout
|
186
187
|
var _default = /*#__PURE__*/_react.default.memo(Layout);
|
187
188
|
exports.default = _default;
|
package/lib/table/index.js
CHANGED
@@ -443,9 +443,9 @@ var ProTable = function ProTable(props) {
|
|
443
443
|
if (showSkeleton && result) {
|
444
444
|
result.disabled = true;
|
445
445
|
}
|
446
|
-
return _objectSpread(
|
446
|
+
return _objectSpread({
|
447
447
|
_primaryKey: props.primaryKey
|
448
|
-
},
|
448
|
+
}, result);
|
449
449
|
},
|
450
450
|
titleProps: function titleProps() {
|
451
451
|
var result = {};
|
@@ -458,7 +458,7 @@ var ProTable = function ProTable(props) {
|
|
458
458
|
return result;
|
459
459
|
},
|
460
460
|
onChange: onChangeRowSelection
|
461
|
-
}), primaryKey);
|
461
|
+
}), data !== null && data !== void 0 ? data : propsDataSource, primaryKey);
|
462
462
|
var rowSelection = useRowSelection ? rowSelectionHook.rowSelection : propsRowSelection;
|
463
463
|
var selectedCount = (rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$selecte = rowSelection.selectedRowKeys) === null || _rowSelection$selecte === void 0 ? void 0 : _rowSelection$selecte.length) || 0;
|
464
464
|
(0, _react.useEffect)(function () {
|
@@ -566,7 +566,7 @@ var ProTable = function ProTable(props) {
|
|
566
566
|
}
|
567
567
|
});
|
568
568
|
// 绑定 Actions
|
569
|
-
(0, _utils2.useActionType)(actionRef, {
|
569
|
+
actionRef.current = (0, _utils2.useActionType)(actionRef, {
|
570
570
|
fullScreen: function fullScreen() {
|
571
571
|
var _actionRef$current2, _actionRef$current2$s;
|
572
572
|
var state = !fullscreenState;
|
@@ -1028,7 +1028,9 @@ var ProTable = function ProTable(props) {
|
|
1028
1028
|
mainAction: mainAction,
|
1029
1029
|
extra: extra,
|
1030
1030
|
toolBar: toolBar,
|
1031
|
-
actionRef:
|
1031
|
+
actionRef: {
|
1032
|
+
current: actionRef.current
|
1033
|
+
},
|
1032
1034
|
columns: propsColumns,
|
1033
1035
|
dataFilter: dataFilter,
|
1034
1036
|
afterDataFilter: afterDataFilter,
|
@@ -71,7 +71,6 @@ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionCo
|
|
71
71
|
finalColumns.push(column);
|
72
72
|
return;
|
73
73
|
}
|
74
|
-
;
|
75
74
|
if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
|
76
75
|
finalColumns.push(column);
|
77
76
|
return;
|
@@ -110,7 +109,8 @@ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionCo
|
|
110
109
|
return;
|
111
110
|
}
|
112
111
|
// @ts-ignore
|
113
|
-
var titleWidth = _utils._.get(childNodes
|
112
|
+
var titleWidth = _utils._.get(childNodes[index], "children[0].scrollWidth", 0);
|
113
|
+
// const titleWidth = childNodes[index]?.children[0].scrollWidth
|
114
114
|
// @ts-ignore
|
115
115
|
if (fixedWidthTypeList[finalType]) {
|
116
116
|
// console.log(
|