dtable-ui-component 6.0.48 → 6.0.89
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/lib/CollapsibleSettingLayout/index.css +2 -2
- package/lib/DTableModalHeader/index.css +0 -1
- package/lib/DepartmentSingleSelectFormatter/index.js +1 -0
- package/lib/FieldDisplaySetting/index.css +8 -3
- package/lib/GeolocationEditor/pc-editor/map-editor/index.js +1 -1
- package/lib/RowExpandFormatter/formula-formatter/index.js +10 -2
- package/lib/formatterConfig/base-formatter-config.js +3 -1
- package/package.json +1 -1
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
|
|
11
11
|
.collapsible-setting-layout-header .dtable-font {
|
|
12
12
|
font-size: 10px;
|
|
13
|
-
color: #
|
|
13
|
+
color: #999;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
.collapsible-setting-layout-header .dtable-font:hover {
|
|
17
|
-
color: #
|
|
17
|
+
color: #555;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
.collapsible-setting-layout-header .dtable-font.dtable-icon-spin {
|
|
@@ -16,6 +16,7 @@ function DepartmentSingleSelectFormatter(props) {
|
|
|
16
16
|
containerClassName,
|
|
17
17
|
tip
|
|
18
18
|
} = props;
|
|
19
|
+
console.log('DepartmentSingleSelectFormatter', props);
|
|
19
20
|
if (!value || !Array.isArray(departments)) return null;
|
|
20
21
|
const deletedTip = tip || (0, _lang.getLocale)('Deleted_department');
|
|
21
22
|
const department = departments.find(department => department.id === value);
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
+
.field-setting .field-setting-header,
|
|
2
|
+
.field-setting .field-setting-header .form-label {
|
|
3
|
+
cursor: pointer;
|
|
4
|
+
}
|
|
5
|
+
|
|
1
6
|
.field-setting .field-setting-header .expand-button {
|
|
2
|
-
color: #
|
|
7
|
+
color: #999;
|
|
3
8
|
font-size: 10px;
|
|
4
9
|
cursor: pointer;
|
|
5
10
|
transition: transform .3s cubic-bezier(.645,.045,.355,1);
|
|
@@ -10,12 +15,12 @@
|
|
|
10
15
|
}
|
|
11
16
|
|
|
12
17
|
.field-setting .field-setting-header .expand-button:hover {
|
|
13
|
-
color: #
|
|
18
|
+
color: #555;
|
|
14
19
|
cursor: pointer;
|
|
15
20
|
}
|
|
16
21
|
|
|
17
22
|
.field-setting .field-setting-banner .show-all-button {
|
|
18
|
-
color: #
|
|
23
|
+
color: #ed7109;
|
|
19
24
|
cursor: pointer;
|
|
20
25
|
font-size: 12px;
|
|
21
26
|
}
|
|
@@ -492,7 +492,7 @@ class MapEditor extends _react.Component {
|
|
|
492
492
|
}))))));
|
|
493
493
|
}
|
|
494
494
|
return /*#__PURE__*/_react.default.createElement(_largeEditor.default, Object.assign({}, this.props, {
|
|
495
|
-
value: value,
|
|
495
|
+
value: this.state.value,
|
|
496
496
|
setValue: this.setValue,
|
|
497
497
|
toggleFullScreen: this.toggleFullScreen
|
|
498
498
|
}));
|
|
@@ -91,7 +91,8 @@ class RowExpandFormulaFormatter extends _react.default.Component {
|
|
|
91
91
|
const {
|
|
92
92
|
value,
|
|
93
93
|
column,
|
|
94
|
-
collaborators
|
|
94
|
+
collaborators,
|
|
95
|
+
departments
|
|
95
96
|
} = this.props;
|
|
96
97
|
const {
|
|
97
98
|
array_type,
|
|
@@ -101,7 +102,14 @@ class RowExpandFormulaFormatter extends _react.default.Component {
|
|
|
101
102
|
return null;
|
|
102
103
|
}
|
|
103
104
|
const Formatter = _baseFormatterConfig.default[array_type];
|
|
104
|
-
let formatterProps = this.getFormatterProps(array_type, array_data, collaborators);
|
|
105
|
+
// let formatterProps = this.getFormatterProps(array_type, array_data, collaborators);
|
|
106
|
+
let formatterProps = {
|
|
107
|
+
column: {
|
|
108
|
+
data: array_data
|
|
109
|
+
},
|
|
110
|
+
readOnly: true,
|
|
111
|
+
departments
|
|
112
|
+
};
|
|
105
113
|
if ((0, _utils.isArrayFormatColumn)(array_type)) {
|
|
106
114
|
formatterProps.value = value;
|
|
107
115
|
return this.renderBorder(this.createColumnFormatter(Formatter, formatterProps));
|
|
@@ -28,6 +28,7 @@ var _EmailFormatter = _interopRequireDefault(require("../EmailFormatter"));
|
|
|
28
28
|
var _DurationFormatter = _interopRequireDefault(require("../DurationFormatter"));
|
|
29
29
|
var _RateFormatter = _interopRequireDefault(require("../RateFormatter"));
|
|
30
30
|
var _ButtonFormatter = _interopRequireDefault(require("../ButtonFormatter"));
|
|
31
|
+
var _DepartmentSingleSelectFormatter = _interopRequireDefault(require("../DepartmentSingleSelectFormatter"));
|
|
31
32
|
const BaseFormatterConfig = {
|
|
32
33
|
[_dtableUtils.CellType.DEFAULT]: /*#__PURE__*/_react.default.createElement(_TextFormatter.default, null),
|
|
33
34
|
[_dtableUtils.CellType.TEXT]: /*#__PURE__*/_react.default.createElement(_TextFormatter.default, null),
|
|
@@ -50,6 +51,7 @@ const BaseFormatterConfig = {
|
|
|
50
51
|
[_dtableUtils.CellType.EMAIL]: /*#__PURE__*/_react.default.createElement(_EmailFormatter.default, null),
|
|
51
52
|
[_dtableUtils.CellType.DURATION]: /*#__PURE__*/_react.default.createElement(_DurationFormatter.default, null),
|
|
52
53
|
[_dtableUtils.CellType.RATE]: /*#__PURE__*/_react.default.createElement(_RateFormatter.default, null),
|
|
53
|
-
[_dtableUtils.CellType.BUTTON]: /*#__PURE__*/_react.default.createElement(_ButtonFormatter.default, null)
|
|
54
|
+
[_dtableUtils.CellType.BUTTON]: /*#__PURE__*/_react.default.createElement(_ButtonFormatter.default, null),
|
|
55
|
+
[_dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT]: /*#__PURE__*/_react.default.createElement(_DepartmentSingleSelectFormatter.default, null)
|
|
54
56
|
};
|
|
55
57
|
var _default = exports.default = BaseFormatterConfig;
|