@bchr/bchr-front-lib 0.3.127 → 0.3.129

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 +6 -0
  2. package/package.json +1 -1
  3. package/src/base/layout/ui_tpl/form/FormForModify.js +6 -2
package/lib/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -344,6 +344,7 @@ 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";
347
348
  var component, valuePropName;
348
349
 
349
350
  if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -365,6 +366,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
365
366
 
366
367
  switch (ui_render_type) {
367
368
  case _consts.UI_RENDER_TYPE.INPUT:
369
+ dataType = "string";
368
370
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
369
371
  key: form_id + "_" + code,
370
372
  placeholder: "请填写" + name,
@@ -386,6 +388,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
386
388
  break;
387
389
 
388
390
  case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
391
+ dataType = "string";
389
392
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
390
393
  ui_render_type: 'browse',
391
394
  initValue: displayValue
@@ -399,6 +402,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
399
402
  break;
400
403
 
401
404
  case _consts.UI_RENDER_TYPE.TEXT_AREA:
405
+ dataType = "string";
402
406
  component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input.TextArea, _extends({
403
407
  key: form_id + "_" + code,
404
408
  placeholder: "请填写" + name,
@@ -640,11 +644,13 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
640
644
  rules: [{
641
645
  required: !dataItem.b_readonly && b_required,
642
646
  message: "请填写" + name,
647
+ type: dataType,
643
648
  whitespace: true,
644
649
  validator: _this2.validator.bind(_assertThisInitialized(_this2), !dataItem.b_readonly && b_required, ui_render_type)
645
650
  }, {
646
651
  required: false,
647
652
  message: name + "格式不正确",
653
+ type: dataType,
648
654
  whitespace: true,
649
655
  validator: _this2.formatValidator.bind(_assertThisInitialized(_this2)),
650
656
  pattern: regexp_pattern
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.129",
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,6 +338,7 @@ 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";
341
342
 
342
343
  let component, valuePropName;
343
344
  if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -358,6 +359,7 @@ class FormForModify extends React.Component{
358
359
 
359
360
  switch (ui_render_type) {
360
361
  case UI_RENDER_TYPE.INPUT:
362
+ dataType = "string";
361
363
  component = b_readonly ? (
362
364
  <div>
363
365
  <span>{displayValue}</span>
@@ -395,6 +397,7 @@ class FormForModify extends React.Component{
395
397
  );
396
398
  break;
397
399
  case UI_RENDER_TYPE.INPUT_PASSWORD:
400
+ dataType = "string";
398
401
  component = b_readonly ? (
399
402
  <div>
400
403
  <InputPassword ui_render_type={'browse'} initValue={displayValue}/>
@@ -413,6 +416,7 @@ class FormForModify extends React.Component{
413
416
  );
414
417
  break;
415
418
  case UI_RENDER_TYPE.TEXT_AREA:
419
+ dataType = "string";
416
420
  component = b_readonly ? (
417
421
  <div>
418
422
  <span>{displayValue}</span>
@@ -728,8 +732,8 @@ class FormForModify extends React.Component{
728
732
  name={code}
729
733
  initialValue={initialValue}
730
734
  rules={[
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}
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}
733
737
  ]}
734
738
  hasFeedback={(!dataItem.b_readonly && b_required)}
735
739
  valuePropName={valuePropName ? valuePropName : "value"}