@bchr/bchr-front-lib 0.3.127 → 0.3.131

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.
Files changed (5) hide show
  1. package/lib/base/layout/ui_tpl/form/FormForModify.js +10 -0
  2. package/lib/services/HttpService.js +20 -18
  3. package/package.json +1 -1
  4. package/src/base/layout/ui_tpl/form/FormForModify.js +14 -1
  5. package/src/services/HttpService.js +20 -17
package/lib/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -949,6 +949,16 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
949
949
  return Promise.resolve();
950
950
  } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_NUMBER) {
951
951
  return value != null ? Promise.resolve() : Promise.reject("validate fail");
952
+ } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT || ui_render_type === _consts.UI_RENDER_TYPE.TEXT_AREA || ui_render_type === _consts.UI_RENDER_TYPE.INPUT_PASSWORD) {
953
+ if (!value) {
954
+ return Promise.reject("validate fail");
955
+ } else {
956
+ if (value.trim().length === 0) {
957
+ return Promise.reject("validate fail");
958
+ } else {
959
+ return Promise.resolve();
960
+ }
961
+ }
952
962
  } else {
953
963
  return !value ? Promise.reject("validate fail") : Promise.resolve();
954
964
  }
package/lib/services/HttpService.js CHANGED
@@ -129,26 +129,27 @@ var HttpService = /*#__PURE__*/function () {
129
129
 
130
130
  if (!rpcMethodName) {
131
131
  rpcMethodName = "";
132
- }
132
+ } // if (!this.__checkJSONObjectSecurity(jsonObject)) {
133
+ //
134
+ // }
133
135
 
134
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
135
- if (jsonObject) {
136
- ajaxOptions.data = jsonObject;
137
- }
138
136
 
139
- if (ajaxOptions.rpcMethodName) {
140
- delete ajaxOptions.rpcMethodName;
141
- }
137
+ if (jsonObject) {
138
+ ajaxOptions.data = jsonObject;
139
+ }
142
140
 
143
- ajaxOptions.type = "post";
144
- ajaxOptions.dataType = "json";
141
+ if (ajaxOptions.rpcMethodName) {
142
+ delete ajaxOptions.rpcMethodName;
143
+ }
145
144
 
146
- if (!ajaxOptions.url) {
147
- ajaxOptions.url = this.requestContextPath + rpcMethodName;
148
- }
145
+ ajaxOptions.type = "post";
146
+ ajaxOptions.dataType = "json";
149
147
 
150
- return _jquery["default"].ajax(ajaxOptions);
148
+ if (!ajaxOptions.url) {
149
+ ajaxOptions.url = this.requestContextPath + rpcMethodName;
151
150
  }
151
+
152
+ return _jquery["default"].ajax(ajaxOptions);
152
153
  }
153
154
  }, {
154
155
  key: "__postForMock",
@@ -264,11 +265,12 @@ var HttpService = /*#__PURE__*/function () {
264
265
 
265
266
  if (_jquery["default"].isPlainObject(ajaxOptions.data)) {
266
267
  jsonObject = ajaxOptions.data;
267
- }
268
+ } // if (!this.__checkJSONObjectSecurity(jsonObject)) {
269
+ //
270
+ // }
268
271
 
269
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
270
- return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
271
- }
272
+
273
+ return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
272
274
  }
273
275
  }, {
274
276
  key: "postJSONAllowHTML",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.127",
3
+ "version": "0.3.131",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -758,7 +758,20 @@ class FormForModify extends React.Component{
758
758
  else if (ui_render_type === UI_RENDER_TYPE.INPUT_NUMBER) {
759
759
  return value != null ? Promise.resolve() : Promise.reject("validate fail");
760
760
  }
761
- else {
761
+ else if (ui_render_type === UI_RENDER_TYPE.INPUT
762
+ || ui_render_type === UI_RENDER_TYPE.TEXT_AREA
763
+ || ui_render_type === UI_RENDER_TYPE.INPUT_PASSWORD ) {
764
+
765
+ if (!value) {
766
+ return Promise.reject("validate fail");
767
+ } else {
768
+ if(value.trim().length===0) {
769
+ return Promise.reject("validate fail");
770
+ } else {
771
+ return Promise.resolve();
772
+ }
773
+ }
774
+ } else {
762
775
  return !value ? Promise.reject("validate fail") : Promise.resolve();
763
776
  }
764
777
  }
package/src/services/HttpService.js CHANGED
@@ -114,24 +114,25 @@ class HttpService {
114
114
  rpcMethodName = "";
115
115
  }
116
116
 
117
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
118
- if (jsonObject) {
119
- ajaxOptions.data = jsonObject;
120
- }
121
-
122
- if (ajaxOptions.rpcMethodName) {
123
- delete ajaxOptions.rpcMethodName;
124
- }
117
+ // if (!this.__checkJSONObjectSecurity(jsonObject)) {
118
+ //
119
+ // }
120
+ if (jsonObject) {
121
+ ajaxOptions.data = jsonObject;
122
+ }
125
123
 
126
- ajaxOptions.type = "post";
127
- ajaxOptions.dataType = "json";
124
+ if (ajaxOptions.rpcMethodName) {
125
+ delete ajaxOptions.rpcMethodName;
126
+ }
128
127
 
129
- if (!ajaxOptions.url) {
130
- ajaxOptions.url = this.requestContextPath + rpcMethodName;
131
- }
128
+ ajaxOptions.type = "post";
129
+ ajaxOptions.dataType = "json";
132
130
 
133
- return $.ajax(ajaxOptions);
131
+ if (!ajaxOptions.url) {
132
+ ajaxOptions.url = this.requestContextPath + rpcMethodName;
134
133
  }
134
+
135
+ return $.ajax(ajaxOptions);
135
136
  }
136
137
 
137
138
  __postForMock(mockOptions) {
@@ -250,9 +251,11 @@ class HttpService {
250
251
  jsonObject = ajaxOptions.data;
251
252
  }
252
253
 
253
- if (!this.__checkJSONObjectSecurity(jsonObject)) {
254
- return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
255
- }
254
+ // if (!this.__checkJSONObjectSecurity(jsonObject)) {
255
+ //
256
+ // }
257
+
258
+ return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
256
259
  }
257
260
 
258
261
  postJSONAllowHTML(options, jsonObject, mockOptions) {