refactor: ui warning message

apps/knowledge/models/knowledge.py

@@ -120,7 +120,7 @@ class Knowledge(AppModelMixin):
     name = models.CharField(max_length=150, verbose_name="知识库名称")
     workspace_id = models.CharField(max_length=64, verbose_name="工作空间id", default="default", db_index=True)
     desc = models.CharField(max_length=256, verbose_name="描述")
-    user = models.ForeignKey(User, on_delete=models.DO_NOTHING, verbose_name="所属用户")
+    user = models.ForeignKey(User, on_delete=models.SET_NULL, db_constraint=False, blank=True, null=True)
     type = models.IntegerField(verbose_name='类型', choices=KnowledgeType.choices, default=KnowledgeType.BASE)
     scope = models.CharField(max_length=20, verbose_name='可用范围', choices=KnowledgeScope.choices,
                              default=KnowledgeScope.WORKSPACE)

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -1746,7 +1746,7 @@ msgstr "密码和确认密码不一致"
 
 #: apps/common/constants/exception_code_constants.py:44
 msgid "The nickname is already registered"
-msgstr "昵称已注册"
+msgstr "姓名已注册"
 
 #: apps/common/constants/permission_constants.py:209
 msgid "System Setting"
@@ -5706,7 +5706,7 @@ msgstr "用户名"
 #: apps/role_setting/api/role_setting.py:146 apps/workspace/api/workspace.py:84
 #: apps/xpack/api/chat_user.py:106
 msgid "Nickname"
-msgstr "昵称"
+msgstr "姓名"
 
 #: apps/role_setting/api/role_setting.py:148
 msgid "Workspace Name"
@@ -6786,7 +6786,7 @@ msgstr "邮箱"
 #: apps/users/serializers/user.py:59 apps/users/serializers/user.py:140
 #: apps/xpack/serializers/chat_user.py:88
 msgid "Nick name"
-msgstr "昵称"
+msgstr "姓名"
 
 #: apps/users/serializers/user.py:60 apps/users/serializers/user.py:145
 #: apps/users/serializers/user.py:263 apps/xpack/api/chat_user.py:108
@@ -7326,7 +7326,7 @@ msgstr "用户组名称"
 #: apps/xpack/api/chat_user.py:132 apps/xpack/serializers/chat_user.py:120
 #: apps/xpack/serializers/resource_chat_user.py:37
 msgid "Username or Nickname"
-msgstr "用户名或昵称"
+msgstr "用户名或姓名"
 
 #: apps/xpack/api/chat_user.py:148 apps/xpack/serializers/chat_user.py:360
 msgid "Sync Type"

apps/models_provider/models/model_management.py

@@ -33,7 +33,7 @@ class Model(AppModelMixin):
 
     model_name = models.CharField(max_length=128, verbose_name="模型名称")
 
-    user = models.ForeignKey(User, on_delete=models.DO_NOTHING, verbose_name="成员用户id")
+    user = models.ForeignKey(User, on_delete=models.SET_NULL, db_constraint=False, blank=True, null=True)
 
     provider = models.CharField(max_length=128, verbose_name='供应商')
 

ui/src/locales/lang/en-US/views/user-manage.ts

@@ -31,11 +31,13 @@ export default {
     phone: {
       label: 'Phone',
       placeholder: 'Please enter phone',
+      invalidMessage: 'Invalid phone format',
     },
   },
   source: {
     label: 'User Source',
     local: 'System User',
+    localCreate: 'Local Create',
     wecom: 'WeCom',
     lark: 'Lark',
     dingtalk: 'DingTalk',

ui/src/locales/lang/zh-CN/views/user-manage.ts

@@ -29,11 +29,13 @@ export default {
     phone: {
       label: '手机号',
       placeholder: '请输入手机号',
+      invalidMessage: '手机号格式不正确',
     },
   },
   source: {
     label: '用户来源',
     local: '系统用户',
+    localCreate: '本地创建',
     wecom: '企业微信',
     lark: '飞书',
     dingtalk: '钉钉',

ui/src/locales/lang/zh-Hant/views/user-manage.ts

@@ -30,11 +30,13 @@ export default {
     phone: {
       label: '手機號碼',
       placeholder: '請輸入手機號碼',
+      invalidMessage: '手機號碼格式不正確',
     },
   },
   source: {
     label: '使用者來源',
     local: '系統使用者',
+     localCreate: '本地建立',
     wecom: '企業微信',
     lark: '飛書',
     dingtalk: '釘釘',

ui/src/views/system-chat-user/user-manage/component/UserDrawer.vue

@@ -20,7 +20,7 @@
         <el-input type="email" v-model="userForm.email" :placeholder="$t('views.login.loginForm.email.placeholder')">
         </el-input>
       </el-form-item>
-      <el-form-item :label="$t('views.userManage.userForm.phone.label')">
+      <el-form-item :label="$t('views.userManage.userForm.phone.label')" prop="phone">
         <el-input v-model="userForm.phone" :placeholder="$t('views.userManage.userForm.phone.placeholder')">
         </el-input>
       </el-form-item>
@@ -84,7 +84,7 @@ const rules = reactive({
       trigger: 'blur',
     },
     {
-      min: 6,
+      min: 4,
       max: 20,
       message: t('views.login.loginForm.username.lengthMessage'),
       trigger: 'blur',
@@ -97,6 +97,13 @@ const rules = reactive({
       trigger: 'blur',
     },
   ],
+  phone: [
+    {
+      pattern: /^1[3-9]\d{9}$/,
+      message: t('views.userManage.userForm.phone.invalidMessage'),
+      trigger: 'blur',
+    },
+  ],
 })
 const visible = ref<boolean>(false)
 const loading = ref(false)

ui/src/views/system-chat-user/user-manage/index.vue

@@ -88,7 +88,7 @@
             <template #default="{ row }">
               {{
                 row.source === 'LOCAL'
-                  ? $t('views.userManage.source.local')
+                  ? $t('views.userManage.source.localCreate')
                   : row.source === 'wecom'
                     ? $t('views.userManage.source.wecom')
                     : row.source === 'lark'
@@ -258,7 +258,7 @@ function createUser() {
 
 function deleteUserManage(row: ChatUserItem) {
   MsgConfirm(
-    `${t('views.userManage.delete.confirmTitle')}${row.username} ?`,
+    `${t('views.userManage.delete.confirmTitle')}${row.nick_name} ?`,
     '',
     {
       confirmButtonText: t('common.confirm'),

ui/src/views/system/user-manage/component/UserDrawer.vue

@@ -44,7 +44,7 @@
         >
         </el-input>
       </el-form-item>
-      <el-form-item :label="$t('views.userManage.userForm.phone.label')">
+      <el-form-item :label="$t('views.userManage.userForm.phone.label')" prop="phone">
         <el-input v-model="userForm.phone"
                   :placeholder="$t('views.userManage.userForm.phone.placeholder')">
         </el-input>
@@ -207,6 +207,13 @@ const rules = reactive({
       trigger: 'blur',
     },
   ],
+  phone: [
+    {
+      pattern: /^1[3-9]\d{9}$/,
+      message: t('views.userManage.userForm.phone.invalidMessage'),
+      trigger: 'blur',
+    },
+  ],
 })
 const visible = ref<boolean>(false)
 const loading = ref(false)

ui/src/views/system/user-manage/index.vue

@@ -234,7 +234,7 @@ function createUser() {
 
 function deleteUserManage(row: any) {
   MsgConfirm(
-    `${t('views.userManage.delete.confirmTitle')}${row.username} ?`,
+    `${t('views.userManage.delete.confirmTitle')}${row.nick_name} ?`,
     t('views.userManage.delete.confirmMessage'),
     {
       confirmButtonText: t('common.confirm'),