fmui-base 2.0.26 → 2.0.28
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/README.md +2 -0
- package/lib/form/form.js +2 -1
- package/lib/form/table.js +24 -18
- package/lib/selectMember/select.js +21 -16
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -1398,8 +1398,9 @@ var PageHome = function (_React$Component) {
|
|
|
1398
1398
|
calculateExp = calculateExp.replace(new RegExp("\\[" + fieldArrayItem + "\\]", "g"), "(" + fieldArrayItemValue + ")");
|
|
1399
1399
|
}
|
|
1400
1400
|
calculateExp = calculateExp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
|
|
1401
|
+
var res = "";
|
|
1401
1402
|
try {
|
|
1402
|
-
|
|
1403
|
+
res = eval(calculateExp);
|
|
1403
1404
|
} catch (e) {
|
|
1404
1405
|
res = '';
|
|
1405
1406
|
}
|
package/lib/form/table.js
CHANGED
|
@@ -994,15 +994,17 @@ var PageHome = function (_React$Component) {
|
|
|
994
994
|
decimalPlace = item.decimalPlace;
|
|
995
995
|
}
|
|
996
996
|
});
|
|
997
|
-
if (
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
if (fieldArray.length == 0) {
|
|
1001
|
-
var aDP = this.getActualDecimalPlace(exp);
|
|
1002
|
-
res = res.toFixed(aDP) + '';
|
|
997
|
+
if (exp.indexOf("differHalfDate") < 0) {
|
|
998
|
+
if (fieldType == 'int' || fieldType == 'float') {
|
|
999
|
+
res = Number(res).toFixed(decimalPlace) + '';
|
|
1003
1000
|
} else {
|
|
1004
|
-
|
|
1005
|
-
|
|
1001
|
+
if (fieldArray.length == 0) {
|
|
1002
|
+
var aDP = this.getActualDecimalPlace(exp);
|
|
1003
|
+
res = res.toFixed(aDP) + '';
|
|
1004
|
+
} else {
|
|
1005
|
+
var maxDP = this.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
|
|
1006
|
+
res = res.toFixed(maxDP) + '';
|
|
1007
|
+
}
|
|
1006
1008
|
}
|
|
1007
1009
|
}
|
|
1008
1010
|
}
|
|
@@ -1074,7 +1076,8 @@ var PageHome = function (_React$Component) {
|
|
|
1074
1076
|
//当为时间时且有differDate或者differHour函数
|
|
1075
1077
|
var differDateRegExp = new RegExp("differDate\\(", "g");
|
|
1076
1078
|
var differHourRegExp = new RegExp("differHour\\(", "g");
|
|
1077
|
-
|
|
1079
|
+
var differHalfDateRegExp = new RegExp("differHalfDate\\(", "g");
|
|
1080
|
+
if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDateRegExp)) {
|
|
1078
1081
|
//当有differDate函数
|
|
1079
1082
|
if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
|
|
1080
1083
|
//filedItemValue = 0;
|
|
@@ -1107,6 +1110,7 @@ var PageHome = function (_React$Component) {
|
|
|
1107
1110
|
exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
|
|
1108
1111
|
exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
|
|
1109
1112
|
exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
|
|
1113
|
+
exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
|
|
1110
1114
|
try {
|
|
1111
1115
|
var res = eval(exp);
|
|
1112
1116
|
} catch (e) {
|
|
@@ -1137,15 +1141,17 @@ var PageHome = function (_React$Component) {
|
|
|
1137
1141
|
}
|
|
1138
1142
|
});
|
|
1139
1143
|
|
|
1140
|
-
if (
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
if (fieldArray.length == 0) {
|
|
1144
|
-
var aDP = getActualDecimalPlace(exp);
|
|
1145
|
-
res = res.toFixed(aDP) + '';
|
|
1144
|
+
if (exp.indexOf("differHalfDate") < 0) {
|
|
1145
|
+
if (fieldType == 'int' || fieldType == 'float') {
|
|
1146
|
+
res = Number(res).toFixed(decimalPlace) + '';
|
|
1146
1147
|
} else {
|
|
1147
|
-
|
|
1148
|
-
|
|
1148
|
+
if (fieldArray.length == 0) {
|
|
1149
|
+
var aDP = getActualDecimalPlace(exp);
|
|
1150
|
+
res = res.toFixed(aDP) + '';
|
|
1151
|
+
} else {
|
|
1152
|
+
var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
|
|
1153
|
+
res = res.toFixed(maxDP) + '';
|
|
1154
|
+
}
|
|
1149
1155
|
}
|
|
1150
1156
|
}
|
|
1151
1157
|
}
|
|
@@ -1623,7 +1629,7 @@ var PageHome = function (_React$Component) {
|
|
|
1623
1629
|
)
|
|
1624
1630
|
)
|
|
1625
1631
|
),
|
|
1626
|
-
_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1632
|
+
_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1627
1633
|
_react2.default.createElement(
|
|
1628
1634
|
'div',
|
|
1629
1635
|
{ className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? '' : 't-DN' },
|
|
@@ -47,6 +47,8 @@ var _Toast2 = _interopRequireDefault(_Toast);
|
|
|
47
47
|
|
|
48
48
|
var _variables = require('../db/variables');
|
|
49
49
|
|
|
50
|
+
var _variables2 = _interopRequireDefault(_variables);
|
|
51
|
+
|
|
50
52
|
var _db = require('../db/db');
|
|
51
53
|
|
|
52
54
|
var _db2 = _interopRequireDefault(_db);
|
|
@@ -6987,10 +6989,11 @@ var Page = function (_React$Component) {
|
|
|
6987
6989
|
key: 'memberSearch',
|
|
6988
6990
|
value: function memberSearch(value, type, searchType) {
|
|
6989
6991
|
|
|
6990
|
-
|
|
6991
|
-
|
|
6992
|
-
|
|
6993
|
-
|
|
6992
|
+
if (value != "") {
|
|
6993
|
+
this.setState({
|
|
6994
|
+
nodataText: "无搜索结果"
|
|
6995
|
+
});
|
|
6996
|
+
}
|
|
6994
6997
|
var checkType = this.props.checkType;
|
|
6995
6998
|
var chooseType = this.getChooseType();
|
|
6996
6999
|
var isShowCheckAll = true;
|
|
@@ -7830,7 +7833,9 @@ var Page = function (_React$Component) {
|
|
|
7830
7833
|
$searchbar.attr('maxlength', 20);
|
|
7831
7834
|
},
|
|
7832
7835
|
onChange: function onChange(value) {
|
|
7833
|
-
|
|
7836
|
+
if (value == "") {
|
|
7837
|
+
t.setState({ nodataText: "暂无数据" });
|
|
7838
|
+
}
|
|
7834
7839
|
}
|
|
7835
7840
|
};
|
|
7836
7841
|
content = _react2.default.createElement(
|
|
@@ -7851,13 +7856,13 @@ var Page = function (_React$Component) {
|
|
|
7851
7856
|
_react2.default.createElement(
|
|
7852
7857
|
'div',
|
|
7853
7858
|
null,
|
|
7854
|
-
_react2.default.createElement('img', { src:
|
|
7859
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
7855
7860
|
)
|
|
7856
7861
|
),
|
|
7857
7862
|
_react2.default.createElement(
|
|
7858
7863
|
Box,
|
|
7859
7864
|
{ className: 't-FCc' },
|
|
7860
|
-
|
|
7865
|
+
t.state.nodataText
|
|
7861
7866
|
)
|
|
7862
7867
|
)
|
|
7863
7868
|
)
|
|
@@ -8293,7 +8298,7 @@ var Page = function (_React$Component) {
|
|
|
8293
8298
|
_react2.default.createElement(
|
|
8294
8299
|
'div',
|
|
8295
8300
|
null,
|
|
8296
|
-
_react2.default.createElement('img', { src:
|
|
8301
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
8297
8302
|
)
|
|
8298
8303
|
),
|
|
8299
8304
|
_react2.default.createElement(
|
|
@@ -8620,7 +8625,7 @@ var Page = function (_React$Component) {
|
|
|
8620
8625
|
_react2.default.createElement(
|
|
8621
8626
|
'div',
|
|
8622
8627
|
null,
|
|
8623
|
-
_react2.default.createElement('img', { src:
|
|
8628
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
8624
8629
|
)
|
|
8625
8630
|
),
|
|
8626
8631
|
_react2.default.createElement(
|
|
@@ -8796,7 +8801,7 @@ var Page = function (_React$Component) {
|
|
|
8796
8801
|
_react2.default.createElement(
|
|
8797
8802
|
'div',
|
|
8798
8803
|
null,
|
|
8799
|
-
_react2.default.createElement('img', { src:
|
|
8804
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
8800
8805
|
)
|
|
8801
8806
|
),
|
|
8802
8807
|
_react2.default.createElement(
|
|
@@ -8949,7 +8954,7 @@ var Page = function (_React$Component) {
|
|
|
8949
8954
|
_react2.default.createElement(
|
|
8950
8955
|
'div',
|
|
8951
8956
|
null,
|
|
8952
|
-
_react2.default.createElement('img', { src:
|
|
8957
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
8953
8958
|
)
|
|
8954
8959
|
),
|
|
8955
8960
|
_react2.default.createElement(
|
|
@@ -9162,7 +9167,7 @@ var Page = function (_React$Component) {
|
|
|
9162
9167
|
_react2.default.createElement(
|
|
9163
9168
|
'div',
|
|
9164
9169
|
null,
|
|
9165
|
-
_react2.default.createElement('img', { src:
|
|
9170
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
9166
9171
|
)
|
|
9167
9172
|
),
|
|
9168
9173
|
_react2.default.createElement(
|
|
@@ -9379,7 +9384,7 @@ var Page = function (_React$Component) {
|
|
|
9379
9384
|
_react2.default.createElement(
|
|
9380
9385
|
'div',
|
|
9381
9386
|
null,
|
|
9382
|
-
_react2.default.createElement('img', { src:
|
|
9387
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
9383
9388
|
)
|
|
9384
9389
|
),
|
|
9385
9390
|
_react2.default.createElement(
|
|
@@ -9739,7 +9744,7 @@ var Page = function (_React$Component) {
|
|
|
9739
9744
|
_react2.default.createElement(
|
|
9740
9745
|
'div',
|
|
9741
9746
|
null,
|
|
9742
|
-
_react2.default.createElement('img', { src:
|
|
9747
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
9743
9748
|
)
|
|
9744
9749
|
),
|
|
9745
9750
|
_react2.default.createElement(
|
|
@@ -9988,7 +9993,7 @@ var Page = function (_React$Component) {
|
|
|
9988
9993
|
_react2.default.createElement(
|
|
9989
9994
|
'div',
|
|
9990
9995
|
null,
|
|
9991
|
-
_react2.default.createElement('img', { src:
|
|
9996
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
9992
9997
|
)
|
|
9993
9998
|
),
|
|
9994
9999
|
_react2.default.createElement(
|
|
@@ -10143,7 +10148,7 @@ var Page = function (_React$Component) {
|
|
|
10143
10148
|
_react2.default.createElement(
|
|
10144
10149
|
'div',
|
|
10145
10150
|
null,
|
|
10146
|
-
_react2.default.createElement('img', { src:
|
|
10151
|
+
_react2.default.createElement('img', { src: _variables2.default.nodataIcon, alt: '', style: { width: 68 + 'px' } })
|
|
10147
10152
|
)
|
|
10148
10153
|
),
|
|
10149
10154
|
_react2.default.createElement(
|