bill 1 năm trước cách đây
mục cha
commit
036e9478e4
3 tập tin đã thay đổi với 11 bổ sung5 xóa
  1. 2 2
      src/views/member/edit.vue
  2. 7 1
      src/views/role/edit.vue
  3. 2 2
      src/views/scene/actions.vue

+ 2 - 2
src/views/member/edit.vue

@@ -86,7 +86,7 @@
           {
             required: false,
             max: 200,
-            message: $t('material.ruleRemark1', 200)
+            message: $t('material.ruleRemark1', { max: 200 })
           }
         ]"
       >
@@ -94,7 +94,7 @@
           v-model:value.trim="editMember.remark"
           :resize="false"
           style="height: 104px; resize: none"
-          :placeholder="$t('material.ruleRemark1', 200)"
+          :placeholder="$t('material.ruleRemark1', { max: 200 })"
         />
       </a-form-item>
     </a-form>

+ 7 - 1
src/views/role/edit.vue

@@ -35,7 +35,7 @@
         :rules="[{ required: true, message: $t('role.roleNameRule') }]"
       >
         <a-input
-          v-model:value.trim="editRole.roleName"
+          v-model:value="editRole.roleName"
           :placeholder="$t('role.roleNameRule')"
         />
       </a-form-item>
@@ -74,6 +74,8 @@
 import { ref, defineProps, toRaw, onMounted } from 'vue'
 import { RoutesName } from '@/router'
 import { useRoleStore, useProject, MenuTree } from '@/store'
+import { ui18n } from '@/lang'
+import { message } from 'ant-design-vue'
 
 import { Role } from '@/api'
 import type { FormInstance } from 'ant-design-vue'
@@ -106,6 +108,10 @@ const fromRef = ref<FormInstance>()
 const visible = ref(true)
 
 const saveHandler = async () => {
+  if (!editRole.value.roleName.trim()) {
+    message.error(ui18n.t('role.roleNameRule'))
+    return
+  }
   await fromRef.value?.validate()
   await props.onSave({
     ...toRaw(editRole.value),

+ 2 - 2
src/views/scene/actions.vue

@@ -61,7 +61,7 @@ const deleteScene = () => {
 }
 
 const queryScene = () => {
-  const base = `${projectManage}?projectId=${
+  const base = `${projectManage}&projectId=${
     store.current!.projectId
   }&lang=${lang}`
   if ('num' in props.scene) {
@@ -73,7 +73,7 @@ const queryScene = () => {
 
 const syncScene = () => {
   window.open(
-    `${projectManage}?projectId=${store.current!.projectId}&adjust&lang=${lang}`
+    `${projectManage}&projectId=${store.current!.projectId}&adjust&lang=${lang}`
   )
 }