@zhenliang/sheet 0.1.7-3.beta.8 → 0.1.7-3.beta.9
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/core/table/index.js +6 -4
- package/package.json +1 -1
package/dist/core/table/index.js
CHANGED
|
@@ -260,7 +260,7 @@ var Table = function Table(_ref) {
|
|
|
260
260
|
if (!menuRenderer) {
|
|
261
261
|
if (showRemark) {
|
|
262
262
|
return function (props) {
|
|
263
|
-
var _data$row3;
|
|
263
|
+
var _data$row3, _target$record, _target$record$includ;
|
|
264
264
|
var cell = props.cell;
|
|
265
265
|
var _ref5 = cell !== null && cell !== void 0 ? cell : {},
|
|
266
266
|
_ref5$col = _ref5.col,
|
|
@@ -268,7 +268,8 @@ var Table = function Table(_ref) {
|
|
|
268
268
|
_ref5$row = _ref5.row,
|
|
269
269
|
row = _ref5$row === void 0 ? -1 : _ref5$row;
|
|
270
270
|
var target = data === null || data === void 0 || (_data$row3 = data[row]) === null || _data$row3 === void 0 ? void 0 : _data$row3[col + 1];
|
|
271
|
-
|
|
271
|
+
var cellHasRemark = (_target$record = target.record) === null || _target$record === void 0 || (_target$record = _target$record.remarks) === null || _target$record === void 0 || (_target$record$includ = _target$record.includes) === null || _target$record$includ === void 0 ? void 0 : _target$record$includ.call(_target$record, target.dataIndex);
|
|
272
|
+
if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
|
|
272
273
|
return /*#__PURE__*/_jsx("div", {
|
|
273
274
|
className: "harvest-menu",
|
|
274
275
|
style: _objectSpread({}, props.position),
|
|
@@ -281,7 +282,7 @@ var Table = function Table(_ref) {
|
|
|
281
282
|
return undefined;
|
|
282
283
|
} else {
|
|
283
284
|
return function (props) {
|
|
284
|
-
var _data$row4;
|
|
285
|
+
var _data$row4, _target$record2, _target$record2$inclu;
|
|
285
286
|
var cell = props.cell;
|
|
286
287
|
var _ref6 = cell !== null && cell !== void 0 ? cell : {},
|
|
287
288
|
_ref6$col = _ref6.col,
|
|
@@ -290,7 +291,8 @@ var Table = function Table(_ref) {
|
|
|
290
291
|
row = _ref6$row === void 0 ? -1 : _ref6$row;
|
|
291
292
|
var target = data === null || data === void 0 || (_data$row4 = data[row]) === null || _data$row4 === void 0 ? void 0 : _data$row4[col + 1];
|
|
292
293
|
var MenuFC = menuRenderer;
|
|
293
|
-
|
|
294
|
+
var cellHasRemark = (_target$record2 = target.record) === null || _target$record2 === void 0 || (_target$record2 = _target$record2.remarks) === null || _target$record2 === void 0 || (_target$record2$inclu = _target$record2.includes) === null || _target$record2$inclu === void 0 ? void 0 : _target$record2$inclu.call(_target$record2, target.dataIndex);
|
|
295
|
+
if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
|
|
294
296
|
return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
|
|
295
297
|
target: target,
|
|
296
298
|
children: remarkMenu
|