@bchr/bchr-front-lib 0.3.103 → 0.3.107

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.
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.customDefIcon = customDefIcon;
7
7
  exports.rebuildDate = rebuildDate;
8
- exports.jsonToMap = exports.mapToJson = exports.parentsInsertchildrenOfCustomizeAsParentColumn = exports.listToTreeDataOfCustomizeAsParentColumn = exports.praseStrEmpty = exports.listToTreeDataByTopParentPk = exports.listToTreeData = exports.getFunctionLetHelpFilePath = exports.buildPathNameWithPropsMatch = exports.FunctionLetHelper = exports.genGetterAndReadonlySetter = void 0;
8
+ exports.treeDataToListByChildFieldName = exports.jsonToMap = exports.mapToJson = exports.parentsInsertchildrenOfCustomizeAsParentColumn = exports.listToTreeDataOfCustomizeAsParentColumn = exports.praseStrEmpty = exports.listToTreeDataByTopParentPk = exports.listToTreeData = exports.getFunctionLetHelpFilePath = exports.buildPathNameWithPropsMatch = exports.FunctionLetHelper = exports.genGetterAndReadonlySetter = void 0;
9
9
 
10
10
  var _react = _interopRequireDefault(require("react"));
11
11
 
@@ -195,6 +195,31 @@ var listToTreeData = function listToTreeData(data) {
195
195
 
196
196
  exports.listToTreeData = listToTreeData;
197
197
 
198
+ function getChildNodesToListData(parent_nodes, listData, childFieldName) {
199
+ for (var i = 0, len = parent_nodes.length; i < len; i++) {
200
+ var parent_node_item = parent_nodes[i];
201
+ listData.push(parent_node_item);
202
+ var childrenData = parent_node_item[childFieldName];
203
+
204
+ if (childrenData && childrenData.length > 0) {
205
+ getChildNodesToListData(childrenData, listData, childFieldName);
206
+ }
207
+ }
208
+ }
209
+
210
+ var treeDataToListByChildFieldName = function treeDataToListByChildFieldName(treeData, childFieldName) {
211
+ var listData = [];
212
+
213
+ if (!treeData || treeData.length == 0) {
214
+ return listData;
215
+ }
216
+
217
+ getChildNodesToListData(treeData, listData, childFieldName);
218
+ return listData;
219
+ };
220
+
221
+ exports.treeDataToListByChildFieldName = treeDataToListByChildFieldName;
222
+
198
223
  var listToTreeDataByTopParentPk = function listToTreeDataByTopParentPk(data, topParentPk, children_data_container_column_name) {
199
224
  if (topParentPk != 0 && !topParentPk) {
200
225
  return [];
@@ -23,6 +23,8 @@ var _InputPassword = _interopRequireDefault(require("../InputPassword"));
23
23
 
24
24
  require("../../../AppFormulaFunctions");
25
25
 
26
+ var _BaseAppUtils = require("../../../BaseAppUtils");
27
+
26
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
29
 
28
30
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -62,6 +64,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
62
64
  var FormulasValueType = {
63
65
  Disabled: "disabled",
64
66
  Enabled: "enabled",
67
+ Clear: "clear",
65
68
  Function: "AppFormulaFunctions"
66
69
  };
67
70
 
@@ -747,7 +750,15 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
747
750
  otherFormItemConfig.b_readonly = true;
748
751
  } else if (FormulasValueType.Enabled == formItemValue) {
749
752
  otherFormItemConfig.b_disabled = false;
750
- otherFormItemConfig.b_readonly = true;
753
+ otherFormItemConfig.b_readonly = false;
754
+ } else if (FormulasValueType.Clear == formItemValue) {
755
+ data[code] = null;
756
+ setFieldsValue(_defineProperty({}, code, null));
757
+
758
+ if (display_code) {
759
+ data[display_code] = null;
760
+ setFieldsValue(_defineProperty({}, display_code, null));
761
+ }
751
762
  } else if (formItemValue.startsWith(FormulasValueType.Function)) {
752
763
  var formulaFunctionValue;
753
764
 
@@ -770,36 +781,73 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
770
781
  return "continue";
771
782
  }
772
783
 
773
- data[code] = formulaFunctionValue;
774
- var otherFormItemValue;
784
+ var convertedStateValue = _this2.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForState");
775
785
 
776
- if (_consts.UI_RENDER_TYPE.DATE == ui_render_type) {
777
- otherFormItemValue = (0, _moment["default"])(formulaFunctionValue, "YYYY-MM-DD");
778
- } else {
779
- otherFormItemValue = formulaFunctionValue;
786
+ var convertedFormItemValue = _this2.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForForm");
787
+
788
+ data[code] = convertedStateValue;
789
+ setFieldsValue(_defineProperty({}, code, convertedFormItemValue));
790
+
791
+ if (!display_code || display_code.trim().length == 0) {
792
+ return "continue";
780
793
  }
781
794
 
782
- setFieldsValue(_defineProperty({}, code, otherFormItemValue));
783
- } else {
784
- data[code] = formItemValue;
785
- setFieldsValue(_defineProperty({}, code, formItemValue));
795
+ var defList = def_docs["def_" + ref_pk];
786
796
 
787
- if (display_code && display_code.trim().length > 0) {
788
- var dictList = def_docs["def_" + ref_pk];
797
+ if (defList && defList.length > 0) {
798
+ var dictList;
789
799
 
790
- if (dictList && dictList.length > 0) {
791
- var filteredDict = dictList.find(function (item) {
792
- return item.pk.toString() == formItemValue;
800
+ if (_consts.UI_RENDER_TYPE.SELECT == ui_render_type) {
801
+ dictList = defList;
802
+ } else if (_consts.UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
803
+ dictList = (0, _BaseAppUtils.treeDataToListByChildFieldName)(defList, "children");
804
+ }
805
+
806
+ var filteredDict = dictList.find(function (item) {
807
+ return item.value == formulaFunctionValue;
808
+ });
809
+
810
+ if (filteredDict) {
811
+ var ref_title = filteredDict.title;
812
+ data[display_code] = ref_title;
813
+ setFieldsValue(_defineProperty({}, display_code, ref_title));
814
+ }
815
+ }
816
+ } // last: set value for other form item
817
+ else {
818
+ var _convertedStateValue = _this2.convertStringValueForFormula(ui_render_type, formItemValue, "dataForState");
819
+
820
+ var _convertedFormItemValue = _this2.convertStringValueForFormula(ui_render_type, formItemValue, "dataForForm");
821
+
822
+ data[code] = _convertedStateValue;
823
+ setFieldsValue(_defineProperty({}, code, _convertedFormItemValue));
824
+
825
+ if (!display_code || display_code.trim().length == 0) {
826
+ return "continue";
827
+ }
828
+
829
+ var _defList = def_docs["def_" + ref_pk];
830
+
831
+ if (_defList && _defList.length > 0) {
832
+ var _dictList;
833
+
834
+ if (_consts.UI_RENDER_TYPE.SELECT == ui_render_type) {
835
+ _dictList = _defList;
836
+ } else if (_consts.UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
837
+ _dictList = (0, _BaseAppUtils.treeDataToListByChildFieldName)(_defList, "children");
838
+ }
839
+
840
+ var _filteredDict = _dictList.find(function (item) {
841
+ return item.value == formItemValue;
793
842
  });
794
843
 
795
- if (filteredDict) {
796
- var ref_title = filteredDict.title;
797
- data[display_code] = ref_title;
798
- setFieldsValue(_defineProperty({}, display_code, ref_title));
844
+ if (_filteredDict) {
845
+ var _ref_title = _filteredDict.title;
846
+ data[display_code] = _ref_title;
847
+ setFieldsValue(_defineProperty({}, display_code, _ref_title));
799
848
  }
800
849
  }
801
850
  }
802
- }
803
851
  };
804
852
 
805
853
  for (var i = 0, len = otherFormItemResponses.length; i < len; i++) {
@@ -830,11 +878,30 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
830
878
  info_set_fields = _this$props.info_set_fields;
831
879
  var fieldCodeKeyMap = this.state.fieldCodeKeyMap;
832
880
 
833
- for (var i = 0, len = info_set_fields.length; i < len; i++) {
881
+ if (info_set_fields && info_set_fields.length <= 0) {
882
+ return;
883
+ }
884
+
885
+ var fieldsLength = info_set_fields.length; // first parse formula
886
+
887
+ for (var i = 0; i < fieldsLength; i++) {
834
888
  var formItem = info_set_fields[i];
835
889
  this.preParseFormItemExtConfig(formItem);
836
- var code = formItem.code,
837
- ui_render_type = formItem.ui_render_type;
890
+ formItem.b_disabled = formItem.b_readonly;
891
+ fieldCodeKeyMap[formItem.code] = formItem;
892
+ } // then initialization form item
893
+
894
+
895
+ for (var _i2 = 0; _i2 < fieldsLength; _i2++) {
896
+ var _formItem = info_set_fields[_i2];
897
+ var code = _formItem.code,
898
+ ui_render_type = _formItem.ui_render_type,
899
+ editFormulaConfigs = _formItem.editFormulaConfigs;
900
+
901
+ if (!editFormulaConfigs || editFormulaConfigs.length == 0) {
902
+ continue;
903
+ }
904
+
838
905
  var fieldCodeValue = data[code];
839
906
 
840
907
  if (_consts.UI_RENDER_TYPE.SWITCH == ui_render_type) {
@@ -842,11 +909,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
842
909
  }
843
910
 
844
911
  if (fieldCodeValue) {
845
- this.formItemOnChangeForFormula(formItem, fieldCodeValue);
912
+ this.formItemOnChangeForFormula(_formItem, fieldCodeValue);
846
913
  }
847
-
848
- formItem.b_disabled = formItem.b_readonly;
849
- fieldCodeKeyMap[formItem.code] = formItem;
850
914
  }
851
915
 
852
916
  this.setState({
@@ -1146,6 +1210,83 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
1146
1210
  callback(props);
1147
1211
  }
1148
1212
  }
1213
+ }, {
1214
+ key: "convertStringValueForFormula",
1215
+ // 日期类型的值在表单中和state中的值对象不同(for_data_type: dataForForm || dataForState)
1216
+ value: function convertStringValueForFormula(ui_render_type, formItemValue, for_data_type) {
1217
+ var value;
1218
+
1219
+ switch (ui_render_type) {
1220
+ case _consts.UI_RENDER_TYPE.INPUT:
1221
+ case _consts.UI_RENDER_TYPE.INPUT_NUMBER:
1222
+ case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
1223
+ case _consts.UI_RENDER_TYPE.TEXT_AREA:
1224
+ case _consts.UI_RENDER_TYPE.TREE_SELECT:
1225
+ value = formItemValue;
1226
+ break;
1227
+
1228
+ case _consts.UI_RENDER_TYPE.SELECT:
1229
+ if (typeof formItemValue === 'number') {
1230
+ value = formItemValue && formItemValue > 0 ? formItemValue : null;
1231
+ } else {
1232
+ value = Number(formItemValue);
1233
+ value = formItemValue && formItemValue > 0 ? formItemValue : null;
1234
+ }
1235
+
1236
+ break;
1237
+
1238
+ case _consts.UI_RENDER_TYPE.DATE:
1239
+ if (for_data_type == "dataForForm") {
1240
+ value = formItemValue ? (0, _moment["default"])(formItemValue) : "";
1241
+ } else {
1242
+ value = formItemValue;
1243
+ }
1244
+
1245
+ break;
1246
+
1247
+ case _consts.UI_RENDER_TYPE.DATE_YEAR:
1248
+ if (for_data_type == "dataForForm") {
1249
+ value = formItemValue ? (0, _moment["default"])(formItemValue, 'YYYY') : "";
1250
+ } else {
1251
+ value = formItemValue;
1252
+ }
1253
+
1254
+ break;
1255
+
1256
+ case _consts.UI_RENDER_TYPE.DATE_MONTH:
1257
+ if (for_data_type == "dataForForm") {
1258
+ value = formItemValue ? (0, _moment["default"])(formItemValue, 'YYYYMM') : "";
1259
+ } else {
1260
+ value = formItemValue;
1261
+ }
1262
+
1263
+ break;
1264
+
1265
+ case _consts.UI_RENDER_TYPE.DATE_TIME:
1266
+ if (for_data_type == "dataForForm") {
1267
+ value = formItemValue ? (0, _moment["default"])(formItemValue).format("YYYY-MM-DD hh:mm:ss") : "";
1268
+ } else {
1269
+ value = formItemValue;
1270
+ }
1271
+
1272
+ break;
1273
+
1274
+ case _consts.UI_RENDER_TYPE.SWITCH:
1275
+ if (typeof formItemValue === 'boolean') {
1276
+ value = formItemValue;
1277
+ } else {
1278
+ value = (formItemValue + '' || '').toLowerCase() === 'true' || (formItemValue + '' || '').toLowerCase() === '1' ? true : false;
1279
+ }
1280
+
1281
+ break;
1282
+
1283
+ default:
1284
+ value = formItemValue;
1285
+ break;
1286
+ }
1287
+
1288
+ return value;
1289
+ }
1149
1290
  }, {
1150
1291
  key: "switchOnChange",
1151
1292
  value: function switchOnChange(config, callback, checked, event) {
@@ -131,22 +131,24 @@ var HttpService = /*#__PURE__*/function () {
131
131
  rpcMethodName = "";
132
132
  }
133
133
 
134
- if (jsonObject) {
135
- ajaxOptions.data = jsonObject;
136
- }
134
+ if (!this.__checkJSONObjectSecurity(jsonObject)) {
135
+ if (jsonObject) {
136
+ ajaxOptions.data = jsonObject;
137
+ }
137
138
 
138
- if (ajaxOptions.rpcMethodName) {
139
- delete ajaxOptions.rpcMethodName;
140
- }
139
+ if (ajaxOptions.rpcMethodName) {
140
+ delete ajaxOptions.rpcMethodName;
141
+ }
141
142
 
142
- ajaxOptions.type = "post";
143
- ajaxOptions.dataType = "json";
143
+ ajaxOptions.type = "post";
144
+ ajaxOptions.dataType = "json";
144
145
 
145
- if (!ajaxOptions.url) {
146
- ajaxOptions.url = this.requestContextPath + rpcMethodName;
147
- }
146
+ if (!ajaxOptions.url) {
147
+ ajaxOptions.url = this.requestContextPath + rpcMethodName;
148
+ }
148
149
 
149
- return _jquery["default"].ajax(ajaxOptions);
150
+ return _jquery["default"].ajax(ajaxOptions);
151
+ }
150
152
  }
151
153
  }, {
152
154
  key: "__postForMock",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.103",
3
+ "version": "0.3.107",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -146,6 +146,31 @@ const listToTreeData = function(data) {
146
146
  return treeData;
147
147
  };
148
148
 
149
+
150
+ function getChildNodesToListData(parent_nodes, listData, childFieldName) {
151
+ for (let i = 0, len = parent_nodes.length; i < len; i++) {
152
+ let parent_node_item = parent_nodes[i];
153
+ listData.push(parent_node_item);
154
+
155
+ let childrenData = parent_node_item[childFieldName];
156
+ if (childrenData && childrenData.length > 0) {
157
+ getChildNodesToListData(childrenData, listData, childFieldName);
158
+ }
159
+ }
160
+ }
161
+
162
+ const treeDataToListByChildFieldName = function(treeData, childFieldName) {
163
+ let listData = [];
164
+
165
+ if (!treeData || treeData.length == 0) {
166
+ return listData;
167
+ }
168
+
169
+ getChildNodesToListData(treeData, listData, childFieldName);
170
+
171
+ return listData;
172
+ };
173
+
149
174
  const listToTreeDataByTopParentPk = function(data, topParentPk, children_data_container_column_name) {
150
175
  if (topParentPk != 0 && !topParentPk) {
151
176
  return [];
@@ -261,5 +286,6 @@ export {
261
286
  listToTreeDataOfCustomizeAsParentColumn,
262
287
  parentsInsertchildrenOfCustomizeAsParentColumn,
263
288
  mapToJson,
264
- jsonToMap
289
+ jsonToMap,
290
+ treeDataToListByChildFieldName
265
291
  }
@@ -23,10 +23,12 @@ import zhCN from "antd/es/locale/zh_CN";
23
23
  import HttpService from "../../../../services/HttpService";
24
24
  import InputPassword from "../InputPassword";
25
25
  import '../../../AppFormulaFunctions'
26
+ import {treeDataToListByChildFieldName} from "../../../BaseAppUtils";
26
27
 
27
28
  const FormulasValueType = {
28
29
  Disabled : "disabled",
29
30
  Enabled : "enabled",
31
+ Clear : "clear",
30
32
  Function : "AppFormulaFunctions",
31
33
  }
32
34
 
@@ -45,12 +47,31 @@ class FormForModify extends React.Component{
45
47
  let {data, info_set_fields} = this.props;
46
48
  let {fieldCodeKeyMap} = this.state;
47
49
 
48
- for (let i = 0, len = info_set_fields.length; i < len; i++) {
50
+ if (info_set_fields && info_set_fields.length <= 0) {
51
+ return;
52
+ }
53
+
54
+ let fieldsLength = info_set_fields.length;
55
+ // first parse formula
56
+ for (let i = 0; i < fieldsLength; i++) {
49
57
  let formItem = info_set_fields[i];
50
58
 
51
59
  this.preParseFormItemExtConfig(formItem);
52
60
 
53
- let {code, ui_render_type} = formItem;
61
+ formItem.b_disabled = formItem.b_readonly;
62
+ fieldCodeKeyMap[formItem.code] = formItem;
63
+ }
64
+
65
+ // then initialization form item
66
+ for (let i = 0; i < fieldsLength; i++) {
67
+ let formItem = info_set_fields[i];
68
+
69
+ let {code, ui_render_type, editFormulaConfigs} = formItem;
70
+
71
+ if (!editFormulaConfigs || editFormulaConfigs.length == 0) {
72
+ continue;
73
+ }
74
+
54
75
  let fieldCodeValue = data[code];
55
76
 
56
77
  if (UI_RENDER_TYPE.SWITCH == ui_render_type) {
@@ -60,9 +81,6 @@ class FormForModify extends React.Component{
60
81
  if (fieldCodeValue) {
61
82
  this.formItemOnChangeForFormula(formItem, fieldCodeValue);
62
83
  }
63
-
64
- formItem.b_disabled = formItem.b_readonly;
65
- fieldCodeKeyMap[formItem.code] = formItem;
66
84
  }
67
85
 
68
86
  this.setState({
@@ -1080,7 +1098,15 @@ class FormForModify extends React.Component{
1080
1098
  } else if (FormulasValueType.Enabled == formItemValue) {
1081
1099
 
1082
1100
  otherFormItemConfig.b_disabled = false;
1083
- otherFormItemConfig.b_readonly = true;
1101
+ otherFormItemConfig.b_readonly = false;
1102
+ } else if (FormulasValueType.Clear == formItemValue) {
1103
+ data[code] = null;
1104
+ setFieldsValue({[code]: null});
1105
+
1106
+ if (display_code) {
1107
+ data[display_code] = null;
1108
+ setFieldsValue({[display_code]: null});
1109
+ }
1084
1110
  } else if (formItemValue.startsWith(FormulasValueType.Function)) {
1085
1111
  let formulaFunctionValue;
1086
1112
  if (formItemValue.search("#value#") !== -1) {
@@ -1102,29 +1128,61 @@ class FormForModify extends React.Component{
1102
1128
  continue;
1103
1129
  }
1104
1130
 
1105
- data[code] = formulaFunctionValue;
1131
+ let convertedStateValue = this.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForState");
1132
+ let convertedFormItemValue = this.convertStringValueForFormula(ui_render_type, formulaFunctionValue, "dataForForm");
1106
1133
 
1107
- let otherFormItemValue;
1108
- if (UI_RENDER_TYPE.DATE == ui_render_type) {
1109
- otherFormItemValue = moment(formulaFunctionValue, "YYYY-MM-DD");
1110
- } else {
1111
- otherFormItemValue = formulaFunctionValue;
1134
+ data[code] = convertedStateValue;
1135
+ setFieldsValue({[code]: convertedFormItemValue});
1136
+
1137
+ if (!display_code || display_code.trim().length == 0) {
1138
+ continue;
1112
1139
  }
1113
- setFieldsValue({[code]: otherFormItemValue});
1114
- } else {
1115
- data[code] = formItemValue;
1116
- setFieldsValue({[code]: formItemValue});
1117
-
1118
- if (display_code && display_code.trim().length > 0) {
1119
- let dictList = def_docs["def_" + ref_pk];
1120
- if (dictList && dictList.length > 0) {
1121
- let filteredDict = dictList.find(item => item.pk.toString() == formItemValue);
1122
- if (filteredDict) {
1123
- let ref_title = filteredDict.title;
1124
-
1125
- data[display_code] = ref_title;
1126
- setFieldsValue({[display_code]: ref_title});
1127
- }
1140
+
1141
+ let defList = def_docs["def_" + ref_pk];
1142
+ if (defList && defList.length > 0) {
1143
+ let dictList;
1144
+ if (UI_RENDER_TYPE.SELECT == ui_render_type) {
1145
+ dictList = defList;
1146
+ } else if (UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
1147
+ dictList = treeDataToListByChildFieldName(defList, "children");
1148
+ }
1149
+
1150
+ let filteredDict = dictList.find(item => item.value == formulaFunctionValue);
1151
+ if (filteredDict) {
1152
+ let ref_title = filteredDict.title;
1153
+
1154
+ data[display_code] = ref_title;
1155
+ setFieldsValue({[display_code]: ref_title});
1156
+ }
1157
+ }
1158
+ }
1159
+ // last: set value for other form item
1160
+ else {
1161
+ let convertedStateValue = this.convertStringValueForFormula(ui_render_type, formItemValue, "dataForState");
1162
+ let convertedFormItemValue = this.convertStringValueForFormula(ui_render_type, formItemValue, "dataForForm");
1163
+
1164
+ data[code] = convertedStateValue;
1165
+ setFieldsValue({[code]: convertedFormItemValue});
1166
+
1167
+ if (!display_code || display_code.trim().length == 0) {
1168
+ continue;
1169
+ }
1170
+
1171
+ let defList = def_docs["def_" + ref_pk];
1172
+ if (defList && defList.length > 0) {
1173
+ let dictList;
1174
+ if (UI_RENDER_TYPE.SELECT == ui_render_type) {
1175
+ dictList = defList;
1176
+ } else if (UI_RENDER_TYPE.TREE_SELECT == ui_render_type) {
1177
+ dictList = treeDataToListByChildFieldName(defList, "children");
1178
+ }
1179
+
1180
+ let filteredDict = dictList.find(item => item.value == formItemValue);
1181
+ if (filteredDict) {
1182
+ let ref_title = filteredDict.title;
1183
+
1184
+ data[display_code] = ref_title;
1185
+ setFieldsValue({[display_code]: ref_title});
1128
1186
  }
1129
1187
  }
1130
1188
  }
@@ -1135,6 +1193,68 @@ class FormForModify extends React.Component{
1135
1193
  }
1136
1194
  }
1137
1195
 
1196
+ // 日期类型的值在表单中和state中的值对象不同(for_data_type: dataForForm || dataForState)
1197
+ convertStringValueForFormula(ui_render_type, formItemValue, for_data_type) {
1198
+ let value;
1199
+ switch (ui_render_type) {
1200
+ case UI_RENDER_TYPE.INPUT:
1201
+ case UI_RENDER_TYPE.INPUT_NUMBER:
1202
+ case UI_RENDER_TYPE.INPUT_PASSWORD:
1203
+ case UI_RENDER_TYPE.TEXT_AREA:
1204
+ case UI_RENDER_TYPE.TREE_SELECT:
1205
+ value = formItemValue;
1206
+ break;
1207
+ case UI_RENDER_TYPE.SELECT:
1208
+ if (typeof formItemValue === 'number') {
1209
+ value = formItemValue && formItemValue > 0 ? formItemValue : null;
1210
+ } else {
1211
+ value = Number(formItemValue);
1212
+ value = formItemValue && formItemValue > 0 ? formItemValue : null;
1213
+ }
1214
+ break;
1215
+ case UI_RENDER_TYPE.DATE:
1216
+ if (for_data_type == "dataForForm") {
1217
+ value = (formItemValue ? moment(formItemValue) : "");
1218
+ } else {
1219
+ value = formItemValue;
1220
+ }
1221
+ break;
1222
+ case UI_RENDER_TYPE.DATE_YEAR:
1223
+ if (for_data_type == "dataForForm") {
1224
+ value = (formItemValue ? moment(formItemValue, 'YYYY') : "");
1225
+ } else {
1226
+ value = formItemValue;
1227
+ }
1228
+ break;
1229
+ case UI_RENDER_TYPE.DATE_MONTH:
1230
+ if (for_data_type == "dataForForm") {
1231
+ value = (formItemValue ? moment(formItemValue, 'YYYYMM') : "");
1232
+ } else {
1233
+ value = formItemValue;
1234
+ }
1235
+ break;
1236
+ case UI_RENDER_TYPE.DATE_TIME:
1237
+ if (for_data_type == "dataForForm") {
1238
+ value = (formItemValue ? moment(formItemValue).format("YYYY-MM-DD hh:mm:ss") : "");
1239
+ } else {
1240
+ value = formItemValue;
1241
+ }
1242
+ break;
1243
+ case UI_RENDER_TYPE.SWITCH:
1244
+ if (typeof formItemValue === 'boolean') {
1245
+ value = formItemValue;
1246
+ } else {
1247
+ value = (((formItemValue + '' || '').toLowerCase() === 'true' || (formItemValue + '' || '').toLowerCase() === '1') ? true : false);
1248
+ }
1249
+ break;
1250
+ default:
1251
+ value = formItemValue;
1252
+ break;
1253
+ }
1254
+
1255
+ return value;
1256
+ }
1257
+
1138
1258
  switchOnChange(config, callback, checked, event) {
1139
1259
  this.formItemOnChangeForFormula(config, checked);
1140
1260
 
@@ -114,22 +114,24 @@ class HttpService {
114
114
  rpcMethodName = "";
115
115
  }
116
116
 
117
- if (jsonObject) {
118
- ajaxOptions.data = jsonObject;
119
- }
117
+ if (!this.__checkJSONObjectSecurity(jsonObject)) {
118
+ if (jsonObject) {
119
+ ajaxOptions.data = jsonObject;
120
+ }
120
121
 
121
- if (ajaxOptions.rpcMethodName) {
122
- delete ajaxOptions.rpcMethodName;
123
- }
122
+ if (ajaxOptions.rpcMethodName) {
123
+ delete ajaxOptions.rpcMethodName;
124
+ }
124
125
 
125
- ajaxOptions.type = "post";
126
- ajaxOptions.dataType = "json";
126
+ ajaxOptions.type = "post";
127
+ ajaxOptions.dataType = "json";
127
128
 
128
- if (!ajaxOptions.url) {
129
- ajaxOptions.url = this.requestContextPath + rpcMethodName;
130
- }
129
+ if (!ajaxOptions.url) {
130
+ ajaxOptions.url = this.requestContextPath + rpcMethodName;
131
+ }
131
132
 
132
- return $.ajax(ajaxOptions);
133
+ return $.ajax(ajaxOptions);
134
+ }
133
135
  }
134
136
 
135
137
  __postForMock(mockOptions) {