@bchr/bchr-front-lib 0.3.129 → 0.3.130

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 (3) hide show
  1. package/lib/base/layout/ui_tpl/form/FormForModify.js +10 -6
  2. package/package.json +1 -1
  3. package/src/base/layout/ui_tpl/form/FormForModify.js +16 -7
package/lib/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -344,7 +344,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
344
344
  display_code = display_code || code;
345
345
  var initialValue = data[code];
346
346
  var displayValue = data[display_code];
347
- var dataType = "any";
348
347
  var component, valuePropName;
349
348
 
350
349
  if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -366,7 +365,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
366
365
 
367
366
  switch (ui_render_type) {
368
367
  case _consts.UI_RENDER_TYPE.INPUT:
369
- dataType = "string";
370
368
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
371
369
  key: form_id + "_" + code,
372
370
  placeholder: "请填写" + name,
@@ -388,7 +386,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
388
386
  break;
389
387
 
390
388
  case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
391
- dataType = "string";
392
389
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
393
390
  ui_render_type: 'browse',
394
391
  initValue: displayValue
@@ -402,7 +399,6 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
402
399
  break;
403
400
 
404
401
  case _consts.UI_RENDER_TYPE.TEXT_AREA:
405
- dataType = "string";
406
402
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input.TextArea, _extends({
407
403
  key: form_id + "_" + code,
408
404
  placeholder: "请填写" + name,
@@ -644,13 +640,11 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
644
640
  rules: [{
645
641
  required: !dataItem.b_readonly && b_required,
646
642
  message: "请填写" + name,
647
- type: dataType,
648
643
  whitespace: true,
649
644
  validator: _this2.validator.bind(_assertThisInitialized(_this2), !dataItem.b_readonly && b_required, ui_render_type)
650
645
  }, {
651
646
  required: false,
652
647
  message: name + "格式不正确",
653
- type: dataType,
654
648
  whitespace: true,
655
649
  validator: _this2.formatValidator.bind(_assertThisInitialized(_this2)),
656
650
  pattern: regexp_pattern
@@ -955,6 +949,16 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
955
949
  return Promise.resolve();
956
950
  } else if (ui_render_type === _consts.UI_RENDER_TYPE.INPUT_NUMBER) {
957
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
+ }
958
962
  } else {
959
963
  return !value ? Promise.reject("validate fail") : Promise.resolve();
960
964
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.129",
3
+ "version": "0.3.130",
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
@@ -338,7 +338,6 @@ class FormForModify extends React.Component{
338
338
  display_code = display_code || code;
339
339
  let initialValue = data[code];
340
340
  let displayValue = data[display_code];
341
- let dataType= "any";
342
341
 
343
342
  let component, valuePropName;
344
343
  if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -359,7 +358,6 @@ class FormForModify extends React.Component{
359
358
 
360
359
  switch (ui_render_type) {
361
360
  case UI_RENDER_TYPE.INPUT:
362
- dataType = "string";
363
361
  component = b_readonly ? (
364
362
  <div>
365
363
  <span>{displayValue}</span>
@@ -397,7 +395,6 @@ class FormForModify extends React.Component{
397
395
  );
398
396
  break;
399
397
  case UI_RENDER_TYPE.INPUT_PASSWORD:
400
- dataType = "string";
401
398
  component = b_readonly ? (
402
399
  <div>
403
400
  <InputPassword ui_render_type={'browse'} initValue={displayValue}/>
@@ -416,7 +413,6 @@ class FormForModify extends React.Component{
416
413
  );
417
414
  break;
418
415
  case UI_RENDER_TYPE.TEXT_AREA:
419
- dataType = "string";
420
416
  component = b_readonly ? (
421
417
  <div>
422
418
  <span>{displayValue}</span>
@@ -732,8 +728,8 @@ class FormForModify extends React.Component{
732
728
  name={code}
733
729
  initialValue={initialValue}
734
730
  rules={[
735
- {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), type: dataType, whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
736
- {required: false, message: (name + "格式不正确"), type: dataType, whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
731
+ {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
732
+ {required: false, message: (name + "格式不正确"), whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
737
733
  ]}
738
734
  hasFeedback={(!dataItem.b_readonly && b_required)}
739
735
  valuePropName={valuePropName ? valuePropName : "value"}
@@ -762,7 +758,20 @@ class FormForModify extends React.Component{
762
758
  else if (ui_render_type === UI_RENDER_TYPE.INPUT_NUMBER) {
763
759
  return value != null ? Promise.resolve() : Promise.reject("validate fail");
764
760
  }
765
- 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 {
766
775
  return !value ? Promise.reject("validate fail") : Promise.resolve();
767
776
  }
768
777
  }