@zgfe/business-lib 1.2.40 → 1.2.43-ht.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.
|
@@ -13,7 +13,7 @@ import _ from 'lodash';
|
|
|
13
13
|
import { BizSelect, IconFont, util } from '../../..';
|
|
14
14
|
import { formulaList } from './data';
|
|
15
15
|
import { Tooltip, Input } from 'antd';
|
|
16
|
-
import {
|
|
16
|
+
import { numberAUMOperate } from '../../../attrConditions/utils/operates';
|
|
17
17
|
export var classPrefix = 'aum-formula-container';
|
|
18
18
|
var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
19
19
|
var _useState = useState([]),
|
|
@@ -137,7 +137,7 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
137
137
|
}, "]"), /*#__PURE__*/React.createElement("div", {
|
|
138
138
|
className: "".concat(classPrefix, "-format")
|
|
139
139
|
}, /*#__PURE__*/React.createElement(BizSelect, {
|
|
140
|
-
options:
|
|
140
|
+
options: numberAUMOperate,
|
|
141
141
|
labelField: "name",
|
|
142
142
|
keyField: "value",
|
|
143
143
|
overlayWidth: 96,
|
package/es/chart/demo/muit_y.js
CHANGED
|
@@ -7,12 +7,18 @@ export default (function () {
|
|
|
7
7
|
type: "muit_y",
|
|
8
8
|
showAll: false,
|
|
9
9
|
legendPosition: "bottom",
|
|
10
|
+
unContainLabel: true,
|
|
10
11
|
muit_yAxis: [{
|
|
11
|
-
name: '单位：张'
|
|
12
|
-
|
|
13
|
-
name: '单位：百万'
|
|
12
|
+
name: '单位：张',
|
|
13
|
+
show: false
|
|
14
14
|
}, {
|
|
15
|
+
name: '单位：百万',
|
|
15
16
|
show: false
|
|
17
|
+
}, {
|
|
18
|
+
show: false,
|
|
19
|
+
name: '单位(%)',
|
|
20
|
+
position: 'right',
|
|
21
|
+
offset: 80
|
|
16
22
|
}]
|
|
17
23
|
});
|
|
18
24
|
});
|
package/es/chart/index.js
CHANGED
|
@@ -118,8 +118,14 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
118
118
|
eOption.grid.right = '1%';
|
|
119
119
|
eOption.grid.left = '1%';
|
|
120
120
|
}
|
|
121
|
-
if (type === 'muit_y' && unContainLabel) {
|
|
122
|
-
|
|
121
|
+
if (type === 'muit_y' && unContainLabel && muit_yAxis) {
|
|
122
|
+
var rightNum = -1;
|
|
123
|
+
muit_yAxis.map(function (item) {
|
|
124
|
+
if ((item === null || item === void 0 ? void 0 : item.show) !== false) {
|
|
125
|
+
rightNum += 1;
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
eOption.grid.right = rightNum <= 1 ? 50 : 30 + 50 * rightNum;
|
|
123
129
|
eOption.grid.left = '50';
|
|
124
130
|
eOption.grid.containLabel = false;
|
|
125
131
|
}
|
package/es/datePicker/utils.js
CHANGED
|
@@ -25,7 +25,7 @@ function getAbsoluteDate(unit, count, maxDate) {
|
|
|
25
25
|
case DatePickerTypes.Unit.quarter:
|
|
26
26
|
res.endDate = maxDate;
|
|
27
27
|
var firstOfQuarter = new Date(maxDate.getTime() - (maxDate.getDate() - 1) * dayTime);
|
|
28
|
-
firstOfQuarter.setMonth(firstOfQuarter.getMonth()
|
|
28
|
+
firstOfQuarter.setMonth(firstOfQuarter.getMonth() - firstOfQuarter.getMonth() % 3 - 3 * (count - 1));
|
|
29
29
|
res.startDate = new Date(firstOfQuarter);
|
|
30
30
|
break;
|
|
31
31
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.43-ht.0",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"react": "^16.12.0 || ^17.0.0",
|
|
56
56
|
"yorkie": "^2.0.0"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "9fcd2ae501d306dc67e5308a1b03334099ec6571",
|
|
59
59
|
"gitHooks": {
|
|
60
60
|
"pre-commit": "lint-staged"
|
|
61
61
|
}
|