fmui-base 2.0.14 → 2.0.15
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 +1 -0
- package/lib/form/table.js +3 -1
- package/lib/selectMember/select.js +6 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/table.js
CHANGED
|
@@ -936,7 +936,8 @@ var PageHome = function (_React$Component) {
|
|
|
936
936
|
//当为时间时且有differDate或者differHour函数
|
|
937
937
|
var differDateRegExp = new RegExp("differDate\\(", "g");
|
|
938
938
|
var differHourRegExp = new RegExp("differHour\\(", "g");
|
|
939
|
-
|
|
939
|
+
var differHalfDateRegExp = new RegExp("differHalfDate\\(", "g");
|
|
940
|
+
if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDateRegExp)) {
|
|
940
941
|
//当有differDate函数
|
|
941
942
|
if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
|
|
942
943
|
//filedItemValue = 0;
|
|
@@ -969,6 +970,7 @@ var PageHome = function (_React$Component) {
|
|
|
969
970
|
exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
|
|
970
971
|
exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
|
|
971
972
|
exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
|
|
973
|
+
exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
|
|
972
974
|
try {
|
|
973
975
|
var res = eval(exp);
|
|
974
976
|
} catch (e) {
|
|
@@ -159,7 +159,9 @@ var Page = function (_React$Component) {
|
|
|
159
159
|
if (data.data && data.data.length > 0) {
|
|
160
160
|
for (var j = 0; j < data.data.length; j++) {
|
|
161
161
|
chooseCode += data.data[j].popuCode + ",";
|
|
162
|
-
|
|
162
|
+
if (data.data[j].chooseObj) {
|
|
163
|
+
chooseObj += data.data[j].chooseObj ? data.data[j].chooseObj : "" + ",";
|
|
164
|
+
}
|
|
163
165
|
chooseName += data.data[j].popuName + ",";
|
|
164
166
|
if (data.data[j].popuUrl) {
|
|
165
167
|
extObj[data.data[j].popuCode] = data.data[j];
|
|
@@ -175,6 +177,9 @@ var Page = function (_React$Component) {
|
|
|
175
177
|
}
|
|
176
178
|
}
|
|
177
179
|
} });
|
|
180
|
+
if (popCode.indexOf("common,") >= 0) {
|
|
181
|
+
chooseCode = "common," + chooseCode;
|
|
182
|
+
}
|
|
178
183
|
_this.state = {
|
|
179
184
|
bottomHeight: bottomHeight,
|
|
180
185
|
baseCorpId: baseCorpId,
|