linkmore-design 1.1.41 → 1.1.43
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.
|
@@ -8,7 +8,7 @@ var __rest = this && this.__rest || function (s, e) {
|
|
|
8
8
|
}
|
|
9
9
|
return t;
|
|
10
10
|
};
|
|
11
|
-
import React
|
|
11
|
+
import React from 'react';
|
|
12
12
|
import { omit } from 'lodash';
|
|
13
13
|
import calc, { reset } from '../expression';
|
|
14
14
|
import Select from '../../Select';
|
|
@@ -96,13 +96,17 @@ var CalcExpression = function CalcExpression(props) {
|
|
|
96
96
|
}
|
|
97
97
|
onExpressionChange && onExpressionChange(col, value);
|
|
98
98
|
};
|
|
99
|
-
useEffect(
|
|
99
|
+
// useEffect(() => {
|
|
100
|
+
// // 使用默认值初始化
|
|
101
|
+
// if (col?.defaultExpression) {
|
|
102
|
+
// onChangeRecord(dfs, col.dataIndex, col?.defaultExpression, false)
|
|
103
|
+
// }
|
|
104
|
+
// }, [col?.defaultExpression])
|
|
105
|
+
if (col === null || col === void 0 ? void 0 : col.defaultExpression) {
|
|
100
106
|
// 使用默认值初始化
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
}, [col === null || col === void 0 ? void 0 : col.defaultExpression]);
|
|
105
|
-
if (record && record._group && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
|
|
107
|
+
onChangeRecord(dfs, col.dataIndex, col === null || col === void 0 ? void 0 : col.defaultExpression, false);
|
|
108
|
+
}
|
|
109
|
+
if (record && record.hasOwnProperty('_group') && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
|
|
106
110
|
var select = Object.assign({
|
|
107
111
|
placeholder: '不计算',
|
|
108
112
|
allowClear: false,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
|
-
var _react =
|
|
9
|
+
var _react = _interopRequireDefault(require("react"));
|
|
10
10
|
var _lodash = require("lodash");
|
|
11
11
|
var _expression = _interopRequireWildcard(require("../expression"));
|
|
12
12
|
var _Select = _interopRequireDefault(require("../../Select"));
|
|
@@ -104,13 +104,17 @@ var CalcExpression = function CalcExpression(props) {
|
|
|
104
104
|
}
|
|
105
105
|
onExpressionChange && onExpressionChange(col, value);
|
|
106
106
|
};
|
|
107
|
-
|
|
107
|
+
// useEffect(() => {
|
|
108
|
+
// // 使用默认值初始化
|
|
109
|
+
// if (col?.defaultExpression) {
|
|
110
|
+
// onChangeRecord(dfs, col.dataIndex, col?.defaultExpression, false)
|
|
111
|
+
// }
|
|
112
|
+
// }, [col?.defaultExpression])
|
|
113
|
+
if (col === null || col === void 0 ? void 0 : col.defaultExpression) {
|
|
108
114
|
// 使用默认值初始化
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}, [col === null || col === void 0 ? void 0 : col.defaultExpression]);
|
|
113
|
-
if (record && record._group && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
|
|
115
|
+
onChangeRecord(dfs, col.dataIndex, col === null || col === void 0 ? void 0 : col.defaultExpression, false);
|
|
116
|
+
}
|
|
117
|
+
if (record && record.hasOwnProperty('_group') && isShowSelect && (col === null || col === void 0 ? void 0 : col.dataIndex)) {
|
|
114
118
|
var select = Object.assign({
|
|
115
119
|
placeholder: '不计算',
|
|
116
120
|
allowClear: false,
|