vue2-client 1.8.250 → 1.8.252

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/package.json +1 -1
  2. package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue +2 -2
  3. package/src/utils/reg.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.8.250",
3
+ "version": "1.8.252",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue CHANGED
@@ -303,7 +303,7 @@ export default {
303
303
  if (!formData[item.model]) {
304
304
  formData[item.model] = undefined
305
305
  }
306
- if (item.formDefault) {
306
+ if (!formData[item.model] && !item.formDefault) {
307
307
  if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker'].includes(item.type)) {
308
308
  formData[item.model] = this.getDateRange(item.type, item.formDefault)
309
309
  } else {
@@ -441,7 +441,7 @@ export default {
441
441
  case 'idNumber': {
442
442
  this.rules[groupItem || item.model].push({
443
443
  validator: (rule, value, callback) => {
444
- if (value && (!_IDRe18.test(value) || !_IDre15.test(value))) {
444
+ if (value && !(_IDRe18.test(value) || _IDre15.test(value))) {
445
445
  callback(new Error('请输入正确的身份证号码'))
446
446
  } else {
447
447
  callback()
package/src/utils/reg.js CHANGED
@@ -10,7 +10,7 @@ export const REG_URL =
10
10
  /(((^https?:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[\w]*))?)$/
11
11
 
12
12
  /** 身份证号 */
13
- export const _IDRe18 = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
13
+ export const _IDRe18 = /^\d{6}(18|19|20\d{2})(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/
14
14
  export const _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
15
15
  /** 座机号 */
16
16
  export const REG_LANDLINE = /\d{3}-\d{8}|\d{4}-\d{7}/