From 2ef23f3bbf2b40cea007d94409a3db638d9376ac Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 26 May 2022 13:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonFields/module/form.vue              | 100 ------------------
 src/views/components/field/index.vue          |   5 +
 src/views/components/field/module/form.vue    |  19 ++--
 3 files changed, 18 insertions(+), 106 deletions(-)
 delete mode 100644 src/views/archivesConfig/commonFields/module/form.vue

diff --git a/src/views/archivesConfig/commonFields/module/form.vue b/src/views/archivesConfig/commonFields/module/form.vue
deleted file mode 100644
index fa2cc6c..0000000
--- a/src/views/archivesConfig/commonFields/module/form.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title">
-    <span class="dialog-right-top" />
-    <span class="dialog-left-bottom" />
-    <div class="setting-dialog">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item label="中文名称" prop="fieldCnName">
-          <el-input v-model="form.fieldCnName" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="字段标识" prop="fieldName">
-          <el-input v-model="form.fieldName" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="数据类型" prop="isDataType">
-          <el-select v-model="form.isDataType" placeholder="请选择">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="字段长度" prop="isColumnLength">
-          <el-input-number v-model="form.isColumnLength" controls-position="right" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="默认值" prop="isDefaultValue">
-          <el-input v-model="form.isDefaultValue" style="width: 370px;" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">
-          取消
-        </el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">
-          确认
-        </el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { form } from '@crud/crud'
-
-const defaultForm = {
-  id: null,
-  fieldCnName: '',
-  fieldName: '',
-  isDataType: 1,
-  isColumnLength: 100,
-  isDefaultValue: ''
-}
-export default {
-  mixins: [form(defaultForm)],
-  data() {
-    var checkMaxLength = (rule, value, callback) => {
-      if (!Number.isInteger(value) || value <= 0) {
-        callback(new Error('请输入正整数数字值'))
-      } else {
-        if (this.form.isDataType === 1 && value > 2000) {
-          callback(new Error('字符最大长度不能超过2000位'))
-        } else if (this.form.isDataType === 2 && value > 11) {
-          callback(new Error('数字最大长度不能超过11位'))
-        } else {
-          callback()
-        }
-      }
-    }
-    return {
-      rules: {
-        fieldCnName: [
-          { required: true, message: '请输入中文名称', trigger: 'blur' }
-        ],
-        fieldName: [
-          { required: true, message: '请输入字段标识', trigger: 'blur' }
-        ],
-        isDataType: [
-          { required: true, message: '请选择数据类型', trigger: 'blur' }
-        ],
-        isColumnLength: [
-          { validator: checkMaxLength, trigger: 'blur' }
-        ]
-      },
-      options: [
-        {
-          value: 1,
-          label: '字符',
-          maxlength: 2000
-        },
-        {
-          value: 2,
-          label: '数字',
-          maxlength: 11
-        }
-      ]
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-input-number .el-input__inner {
-  text-align: left;
-}
-</style>
diff --git a/src/views/components/field/index.vue b/src/views/components/field/index.vue
index a3a8f0f..656f34d 100644
--- a/src/views/components/field/index.vue
+++ b/src/views/components/field/index.vue
@@ -117,6 +117,11 @@ export default {
         return false
       }
     },
+    [CRUD.HOOK.beforeToEdit](crud, form, btn) {
+      if (form.isColumnLength === null) {
+        form.isColumnLength = undefined
+      }
+    },
     handleConfirm() {
       verifyMaintenance(encrypt(this.form.verifyCode)).then((res) => {
         if (res) {
diff --git a/src/views/components/field/module/form.vue b/src/views/components/field/module/form.vue
index fa2cc6c..f2d6b14 100644
--- a/src/views/components/field/module/form.vue
+++ b/src/views/components/field/module/form.vue
@@ -49,7 +49,7 @@ export default {
   mixins: [form(defaultForm)],
   data() {
     var checkMaxLength = (rule, value, callback) => {
-      if (!Number.isInteger(value) || value <= 0) {
+      if (value !== undefined && (!Number.isInteger(value) || value <= 0)) {
         callback(new Error('请输入正整数数字值'))
       } else {
         if (this.form.isDataType === 1 && value > 2000) {
@@ -61,13 +61,22 @@ export default {
         }
       }
     }
+    var checkFieldName = (rule, value, callback) => {
+      const reg = /^[A-Za-z][A-Za-z_]+[a-zA-Z]*$/
+      if (reg.test(value)) {
+        callback()
+      } else {
+        callback(new Error('字段标识只能由字母、字符“_”组成，并且必须以字母开头和结尾'))
+      }
+    }
     return {
       rules: {
         fieldCnName: [
           { required: true, message: '请输入中文名称', trigger: 'blur' }
         ],
         fieldName: [
-          { required: true, message: '请输入字段标识', trigger: 'blur' }
+          { required: true, message: '请选择字段标识', trigger: 'blur' },
+          { validator: checkFieldName, trigger: 'blur' }
         ],
         isDataType: [
           { required: true, message: '请选择数据类型', trigger: 'blur' }
@@ -79,13 +88,11 @@ export default {
       options: [
         {
           value: 1,
-          label: '字符',
-          maxlength: 2000
+          label: '字符'
         },
         {
           value: 2,
-          label: '数字',
-          maxlength: 11
+          label: '数字'
         }
       ]
     }