diff --git a/web/.env.development b/web/.env.development index c6e45b8..1ddec77 100644 --- a/web/.env.development +++ b/web/.env.development @@ -3,7 +3,7 @@ ENV = 'development' # 本地环境接口地址 #`VITE_API_URL = 'https://demo.dvadmin.com/api' -VITE_API_URL = 'http://192.168.1.94:10000' +VITE_API_URL = 'http://192.168.1.94:1000' # 是否启用按钮权限 VITE_PM_ENABLED = true diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx index 7895f6f..5b853fc 100644 --- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx +++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx @@ -113,11 +113,31 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp columnSetDisabled: true, //禁止在列设置中选择 }, }, - username: { - title: '账号', + search: { + title: '关键词', + column: { + show: false, + }, search: { show: true, + component: { + props: { + clearable: true, + }, + placeholder: '请输入关键词', + }, }, + form: { + show: false, + component: { + props: { + clearable: true, + }, + }, + }, + }, + username: { + title: '账号', type: 'input', column: { minWidth: 100, //最小列宽 @@ -167,9 +187,6 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp }, name: { title: '姓名', - search: { - show: true, - }, type: 'input', column: { minWidth: 100, //最小列宽 @@ -273,9 +290,6 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp }, mobile: { title: '手机号码', - search: { - show: true, - }, type: 'input', column: { minWidth: 120, //最小列宽 diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue index 7cec118..80f5616 100644 --- a/web/src/views/system/dept/components/DeptUserCom/index.vue +++ b/web/src/views/system/dept/components/DeptUserCom/index.vue @@ -1,16 +1,43 @@ diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue index 78487ba..a6fe2a8 100644 --- a/web/src/views/system/dept/index.vue +++ b/web/src/views/system/dept/index.vue @@ -128,18 +128,18 @@ onMounted(() => { .dept-box { height: 100%; - padding: 10px; - background-color: #fff; + position: relative; box-sizing: border-box; } .dept-left { - position: relative; + background-color: #fff; border-radius: 0 8px 8px 0; + padding: 10px; } .dept-table { - border-radius: 8px 0 0 8px; margin-left: 10px; + padding-bottom: 10px; } diff --git a/web/src/views/system/menu/components/MenuFormCom/index.vue b/web/src/views/system/menu/components/MenuFormCom/index.vue index cad68e0..79929b3 100644 --- a/web/src/views/system/menu/components/MenuFormCom/index.vue +++ b/web/src/views/system/menu/components/MenuFormCom/index.vue @@ -80,13 +80,13 @@ - - - - + + + + @@ -128,10 +128,12 @@ const defaultTreeProps: any = { }; const validateWebPath = (rule: any, value: string, callback: Function) => { let pattern = /^\/.*?/; - if (!pattern.test(value)) { - callback(new Error('请输入正确的地址')); - } else { + let patternUrl = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/; + const reg = menuFormData.is_link ? patternUrl.test(value) : pattern.test(value); + if (reg) { callback(); + } else { + callback(new Error('请输入正确的地址')); } }; @@ -145,7 +147,7 @@ const emit = defineEmits(['drawerClose']); const formRef = ref>(); const rules = reactive({ - web_path: [{ required: true, message: '路由地址请以/开头', validator: validateWebPath, trigger: 'blur' }], + web_path: [{ required: true, message: '请输入正确的地址', validator: validateWebPath, trigger: 'blur' }], name: [{ required: true, message: '菜单名称必填', trigger: 'blur' }], component: [{ required: true, message: '请输入组件地址', trigger: 'blur' }], component_name: [{ required: true, message: '请输入组件名称', trigger: 'blur' }],