-
-
- 🌈 yudao-ui-admin-vue3
-
- 
+ 
{{ upperFirstName }}
-
diff --git a/yudao-ui-admin-vue3/plop/component/index.hbs b/yudao-ui-admin-vue3/plop/component/index.hbs
deleted file mode 100644
index aca6f0a8c..000000000
--- a/yudao-ui-admin-vue3/plop/component/index.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-import {{ upperFirstName }} from './src/{{ upperFirstName }}.vue'
-
-export { {{ upperFirstName }} }
diff --git a/yudao-ui-admin-vue3/plop/component/prompt.js b/yudao-ui-admin-vue3/plop/component/prompt.js
deleted file mode 100644
index 98a852f07..000000000
--- a/yudao-ui-admin-vue3/plop/component/prompt.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const toUpperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1)
-
-module.exports = {
- description: 'Create vue component',
- prompts: [
- {
- type: 'input',
- name: 'name',
- message: '请输入组件名称（Please enter the component name）'
- }
- ],
- actions: (data) => {
- const { name } = data
- const upperFirstName = toUpperCase(name)
-
- const actions = []
- if (name) {
- actions.push({
- type: 'add',
- path: `./src/components/${upperFirstName}/src/${upperFirstName}.vue`,
- templateFile: './plop/component/component.hbs',
- data: {
- name,
- upperFirstName
- }
- }, {
- type: 'add',
- path: `./src/components/${upperFirstName}/index.ts`,
- templateFile: './plop/component/index.hbs',
- data: {
- upperFirstName
- }
- })
- }
-
- return actions
- }
-}
diff --git a/yudao-ui-admin-vue3/plop/view/prompt.js b/yudao-ui-admin-vue3/plop/view/prompt.js
deleted file mode 100644
index dbf324fb6..000000000
--- a/yudao-ui-admin-vue3/plop/view/prompt.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const toUpperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1)
-
-module.exports = {
- description: 'Create vue view',
- prompts: [
- {
- type: 'input',
- name: 'path',
- message: '请输入路径（Please enter a path）',
- default: 'views'
- },
- {
- type: 'input',
- name: 'name',
- message: '请输入模块名称（Please enter module name）'
- }
- ],
- actions: (data) => {
- const { name, path } = data
- const upperFirstName = toUpperCase(name)
-
- const actions = []
- if (name) {
- actions.push({
- type: 'add',
- path: `./src/${path}/${upperFirstName}.vue`,
- templateFile: './plop/view/view.hbs',
- data: {
- name,
- upperFirstName
- }
- })
- }
-
- return actions
- }
-}
diff --git a/yudao-ui-admin-vue3/plop/view/view.hbs b/yudao-ui-admin-vue3/plop/view/view.hbs
deleted file mode 100644
index 9e359a85a..000000000
--- a/yudao-ui-admin-vue3/plop/view/view.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
+
+
-
- 生成器
-
-
- 每分钟
- 每小时
- 每天零点
- 每月一号零点
- 每月最后一天零点
- 每周星期日零点
-
- {{ item.text }}
-
-
-
-
-
-
+
+
@@ -1018,8 +1003,10 @@ const submit = () => {
background: var(--el-color-primary);
color: #fff;
}
-
[data-theme='dark'] .sc-cron-num h4 {
background: var(--el-color-white);
}
+.input-with-select .el-input-group__prepend {
+ background-color: var(--el-fill-color-blank);
+}
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/index.ts b/yudao-ui-admin-vue3/src/components/Cropper/index.ts
new file mode 100644
index 000000000..8fcc61830
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/index.ts
@@ -0,0 +1,4 @@
+import CropperImage from './src/Cropper.vue'
+import CropperAvatar from './src/CropperAvatar.vue'
+
+export { CropperImage, CropperAvatar }
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue
new file mode 100644
index 000000000..919e1d1bb
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue
@@ -0,0 +1,257 @@
+
+ ,
default: () => []
@@ -94,7 +95,7 @@ const toggleClick = () => {
{
@@ -113,10 +115,12 @@ const toggleClick = () => {
- {{ dayjs(data[item.field]).format(item.dateFormat) }}
+ {{
+ data[item.field] !== null ? dayjs(data[item.field]).format(item.dateFormat) : ''
+ }}
-
{{ data[item.field] }}
@@ -127,10 +131,10 @@ const toggleClick = () => {
-
diff --git a/yudao-ui-admin-vue3/src/components/UploadFile/src/UploadImg.vue b/yudao-ui-admin-vue3/src/components/UploadFile/src/UploadImg.vue
new file mode 100644
index 000000000..7f7b3a484
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/UploadFile/src/UploadImg.vue
@@ -0,0 +1,267 @@
+
+
-
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts
deleted file mode 100644
index 78c7c335c..000000000
--- a/yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 此处可直接引用自己项目封装好的 axios 配合后端联调
- */
-
-import request from './../utils/axios' //组件内部封装的axios
-// import request from "@/api/axios.js" //调用项目封装的axios
-
-//获取验证图片 以及token
-export function reqGet(data) {
- return request({
- // url: '/captcha/get',
- url: '/admin-api/system/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
- method: 'post',
- data
- })
-}
-
-//滑动或者点选验证
-export function reqCheck(data) {
- return request({
- // url: '/captcha/check',
- url: '/admin-api/system/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
- method: 'post',
- data
- })
-}
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/utils/axios.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/axios.ts
deleted file mode 100644
index ca68097e7..000000000
--- a/yudao-ui-admin-vue3/src/components/Verifition/src/utils/axios.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import axios from 'axios'
-
-axios.defaults.baseURL = import.meta.env.VITE_BASE_URL
-
-const service = axios.create({
- timeout: 40000,
- headers: {
- 'X-Requested-With': 'XMLHttpRequest',
- 'Content-Type': 'application/json; charset=UTF-8'
- }
-})
-service.interceptors.request.use(
- (config) => {
- return config
- },
- (error) => {
- Promise.reject(error)
- }
-)
-
-// response interceptor
-service.interceptors.response.use((response) => {
- const res = response.data
- return res
-})
-export default service
diff --git a/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue b/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue
index 6539e73cd..13c35bef3 100644
--- a/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue
+++ b/yudao-ui-admin-vue3/src/components/XButton/src/XButton.vue
@@ -35,7 +35,7 @@ const getBindValue = computed(() => {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('workplace.shortcutOperation') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('workplace.index') }}
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/Home/Index2.vue b/yudao-ui-admin-vue3/src/views/Home/Index2.vue
index fb5db7dcd..de91eb54c 100644
--- a/yudao-ui-admin-vue3/src/views/Home/Index2.vue
+++ b/yudao-ui-admin-vue3/src/views/Home/Index2.vue
@@ -1,133 +1,3 @@
-
-
@@ -270,10 +140,140 @@ getAllApi()
-
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue b/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue
index 3cbc28b7b..ee94dcfee 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserSocial.vue
@@ -1,54 +1,70 @@
-
-
-
-
- ![]()
- {{ row.title }}
+
+
+
+ ![]()
+
-
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/Redirect/Redirect.vue b/yudao-ui-admin-vue3/src/views/Redirect/Redirect.vue
index 0b7af7b23..3a6a6a62f 100644
--- a/yudao-ui-admin-vue3/src/views/Redirect/Redirect.vue
+++ b/yudao-ui-admin-vue3/src/views/Redirect/Redirect.vue
@@ -1,12 +1,11 @@
-
-
([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index'
- },
- {
- label: '链路追踪',
- field: 'traceId'
- },
- {
- label: '用户编号',
- field: 'userId',
- search: {
- show: true
- }
- },
- {
- label: '用户类型',
- field: 'userType',
- dictType: DICT_TYPE.USER_TYPE,
- search: {
- show: true
- }
- },
- {
- label: '应用名',
- field: 'applicationName',
- search: {
- show: true
- }
- },
- {
- label: '请求方法名',
- field: 'requestMethod'
- },
- {
- label: '请求地址',
- field: 'requestUrl',
- search: {
- show: true
- }
- },
- {
- label: '请求时间',
- field: 'beginTime',
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '日志编号',
+ action: true,
+ actionWidth: '80px',
+ columns: [
+ {
+ title: '链路追踪',
+ field: 'traceId'
+ },
+ {
+ title: '用户编号',
+ field: 'userId',
+ isSearch: true
+ },
+ {
+ title: '用户类型',
+ field: 'userType',
+ dictType: DICT_TYPE.USER_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '应用名',
+ field: 'applicationName',
+ isSearch: true
+ },
+ {
+ title: '请求方法名',
+ field: 'requestMethod'
+ },
+ {
+ title: '请求地址',
+ field: 'requestUrl',
+ isSearch: true
+ },
+ {
+ title: '请求时间',
+ field: 'beginTime',
+ formatter: 'formatDate',
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: '执行时长',
+ field: 'duration',
+ table: {
+ slots: {
+ default: 'duration_default'
+ }
+ }
+ },
+ {
+ title: '操作结果',
+ field: 'resultCode',
+ isSearch: true,
+ table: {
+ slots: {
+ default: 'resultCode_default'
+ }
}
}
- },
- {
- label: '执行时长',
- field: 'duration'
- },
- {
- label: '操作结果',
- field: 'resultCode',
- search: {
- show: true
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '300px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
index 8ce9dd769..ae1aba8a1 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue
@@ -1,89 +1,27 @@
-
-
-
-
-
-
-
-
+
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts
index 404262be5..713d04824 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts
@@ -1,96 +1,78 @@
import { reactive } from 'vue'
-import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
-const { t } = useI18n() // 国际化
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index'
- },
- {
- label: '链路追踪',
- field: 'traceId'
- },
- {
- label: '用户编号',
- field: 'userId',
- search: {
- show: true
- }
- },
- {
- label: '用户类型',
- field: 'userType',
- dictType: DICT_TYPE.USER_TYPE,
- search: {
- show: true
- }
- },
- {
- label: '应用名',
- field: 'applicationName',
- search: {
- show: true
- }
- },
- {
- label: '请求方法名',
- field: 'requestMethod'
- },
- {
- label: '请求地址',
- field: 'requestUrl',
- search: {
- show: true
- }
- },
- {
- label: '异常发生时间',
- field: 'exceptionTime',
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
- }
- }
- },
- {
- label: '异常名',
- field: 'exceptionName'
- },
- {
- label: '处理状态',
- field: 'processStatus',
- dictType: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '处理人',
- field: 'processUserId'
- },
- {
- label: '处理时间',
- field: 'processTime'
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '300px',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '日志编号',
+ action: true,
+ actionWidth: '300',
+ columns: [
+ {
+ title: '链路追踪',
+ field: 'traceId',
+ isTable: false
},
- detail: {
- show: false
+ {
+ title: '用户编号',
+ field: 'userId',
+ isSearch: true
+ },
+ {
+ title: '用户类型',
+ field: 'userType',
+ dictType: DICT_TYPE.USER_TYPE,
+ isSearch: true
+ },
+ {
+ title: '应用名',
+ field: 'applicationName',
+ isSearch: true
+ },
+ {
+ title: '请求方法名',
+ field: 'requestMethod'
+ },
+ {
+ title: '请求地址',
+ field: 'requestUrl',
+ isSearch: true
+ },
+ {
+ title: '异常发生时间',
+ field: 'exceptionTime',
+ formatter: 'formatDate',
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: '异常名',
+ field: 'exceptionName'
+ },
+ {
+ title: '处理状态',
+ field: 'processStatus',
+ dictType: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '处理人',
+ field: 'processUserId',
+ isTable: false
+ },
+ {
+ title: '处理时间',
+ field: 'processTime',
+ formatter: 'formatDate',
+ isTable: false
}
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
index f6d2e44ed..6a05f063d 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
@@ -1,10 +1,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/build/index.vue b/yudao-ui-admin-vue3/src/views/infra/build/index.vue
index b03cb75c8..514fd656d 100644
--- a/yudao-ui-admin-vue3/src/views/infra/build/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/build/index.vue
@@ -1,7 +1,4 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('action.save') }}
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/codegen.data.ts b/yudao-ui-admin-vue3/src/views/infra/codegen/codegen.data.ts
index 27e49ff31..6de4c7475 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/codegen.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/codegen.data.ts
@@ -1,7 +1,7 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -12,72 +12,45 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ action: true,
+ actionWidth: '400px',
+ columns: [
+ {
+ title: '表名称',
+ field: 'tableName',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '表名称',
- field: 'tableName',
- search: {
- show: true
- }
- },
- {
- label: '表描述',
- field: 'tableComment',
- search: {
- show: true
- }
- },
- {
- label: '实体',
- field: 'className',
- search: {
- show: true
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '表描述',
+ field: 'tableComment',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '实体',
+ field: 'className',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
- }
- },
- {
- label: t('common.updateTime'),
- field: 'updateTime',
- form: {
- show: false
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '500px',
- form: {
- show: false
},
- detail: {
- show: false
+ {
+ title: t('common.updateTime'),
+ field: 'updateTime',
+ formatter: 'formatDate',
+ isForm: false
}
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
index a61bf0f81..9fec5ea04 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
@@ -1,11 +1,13 @@
+
+
+
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/CloumInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/CloumInfoForm.vue
index 00e3a9650..67108364f 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/CloumInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/CloumInfoForm.vue
@@ -1,31 +1,13 @@
-
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
index c2b592207..fd729ce8a 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
@@ -1,10 +1,12 @@
+
+
+
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
index 933d128ef..e4dd8d743 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/ImportTable.vue
@@ -1,21 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/components/Preview.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/components/Preview.vue
index 40bfcbec7..ee26c2083 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/components/Preview.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/components/Preview.vue
@@ -1,12 +1,46 @@
+
+
+
+
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue
index fb56ea9fb..68a214fd3 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue
@@ -1,24 +1,85 @@
-
-
-
-
-
-
-
-
-
- {{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-
-
- {{ dayjs(row.updateTime).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
- ([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ columns: [
+ {
+ title: '参数分类',
+ field: 'category'
},
- detail: {
- show: false
- }
- },
- {
- label: '参数分类',
- field: 'category'
- },
- {
- label: '参数名称',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '参数键名',
- field: 'key',
- search: {
- show: true
- }
- },
- {
- label: '参数键值',
- field: 'value'
- },
- {
- label: '系统内置',
- field: 'type',
- dictType: DICT_TYPE.INFRA_CONFIG_TYPE,
- search: {
- show: true
- }
- },
- {
- label: '是否可见',
- field: 'visible',
- form: {
- component: 'RadioButton',
- componentProps: {
- options: [
- { label: '是', value: true },
- { label: '否', value: false }
- ]
- }
- }
- },
- {
- label: t('form.remark'),
- field: 'remark',
- form: {
- component: 'Input',
- componentProps: {
- type: 'textarea',
- rows: 4
+ {
+ title: '参数名称',
+ field: 'name',
+ isSearch: true
+ },
+ {
+ title: '参数键名',
+ field: 'key',
+ isSearch: true
+ },
+ {
+ title: '参数键值',
+ field: 'value'
+ },
+ {
+ title: '系统内置',
+ field: 'type',
+ dictType: DICT_TYPE.INFRA_CONFIG_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '是否可见',
+ field: 'visible',
+ table: {
+ slots: {
+ default: 'visible_default'
+ }
},
- colProps: {
- span: 24
+ form: {
+ component: 'RadioButton',
+ componentProps: {
+ options: [
+ { label: '是', value: true },
+ { label: '否', value: false }
+ ]
+ }
}
},
- table: {
- show: false
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ isTable: false,
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
+ }
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/config/index.vue b/yudao-ui-admin-vue3/src/views/infra/config/index.vue
index b7a3c4b9d..50a067fcb 100644
--- a/yudao-ui-admin-vue3/src/views/infra/config/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/config/index.vue
@@ -1,166 +1,55 @@
-
-
-
-
-
-
-
-
+
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts
index 4431c0c45..60764d411 100644
--- a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/dataSourceConfig.data.ts
@@ -1,7 +1,7 @@
import { reactive } from 'vue'
import { required } from '@/utils/formRules'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
// 国际化
const { t } = useI18n()
// 表单校验
@@ -12,73 +12,44 @@ export const rules = reactive({
password: [required]
})
// 新增 + 修改
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ action: true,
+ columns: [
+ {
+ title: '数据源名称',
+ field: 'name'
},
- detail: {
- show: false
- }
- },
- {
- label: '数据源名称',
- field: 'name'
- },
- {
- label: '数据源连接',
- field: 'url',
- form: {
- component: 'Input',
- componentProps: {
- type: 'textarea',
- rows: 4
- },
- colProps: {
- span: 24
+ {
+ title: '数据源连接',
+ field: 'url',
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
}
- }
- },
- {
- label: '用户名',
- field: 'username'
- },
- {
- label: '密码',
- field: 'password',
- table: {
- show: false
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
- }
- }
- },
- {
- field: 'action',
- width: '240px',
- label: t('table.action'),
- form: {
- show: false
+ {
+ title: '用户名',
+ field: 'username'
},
- detail: {
- show: false
+ {
+ title: '密码',
+ field: 'password',
+ isTable: false
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false
}
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
index c8b363c1e..bb0937580 100644
--- a/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue
@@ -1,139 +1,42 @@
-
-
-
-
-
- {{ row.createTime ? dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/dbDoc/index.vue b/yudao-ui-admin-vue3/src/views/infra/dbDoc/index.vue
index a31c55495..68385644a 100644
--- a/yudao-ui-admin-vue3/src/views/infra/dbDoc/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/dbDoc/index.vue
@@ -1,13 +1,39 @@
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/druid/index.vue b/yudao-ui-admin-vue3/src/views/infra/druid/index.vue
index 1af927de3..9f216b07e 100644
--- a/yudao-ui-admin-vue3/src/views/infra/druid/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/druid/index.vue
@@ -1,12 +1,12 @@
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts b/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts
index b2383346f..732e7a6ec 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -25,78 +25,57 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '配置编号',
+ action: true,
+ actionWidth: '400px',
+ columns: [
+ {
+ title: '配置名',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '配置名',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '存储器',
- field: 'storage',
- dictType: DICT_TYPE.INFRA_FILE_STORAGE,
- search: {
- show: true
- }
- },
- {
- label: '主配置',
- field: 'primary',
- dictType: DICT_TYPE.INFRA_BOOLEAN_STRING
- },
- {
- label: t('form.remark'),
- field: 'remark',
- form: {
- component: 'Input',
- componentProps: {
- type: 'textarea',
- rows: 4
- },
- colProps: {
- span: 24
+ {
+ title: '存储器',
+ field: 'storage',
+ dictType: DICT_TYPE.INFRA_FILE_STORAGE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '主配置',
+ field: 'master',
+ dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+ dictClass: 'boolean'
+ },
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
+ }
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
- },
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
- }
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '400px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
index b24bbb534..e50905e8b 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
@@ -1,31 +1,224 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileList/fileList.data.ts b/yudao-ui-admin-vue3/src/views/infra/fileList/fileList.data.ts
index e203fd4cf..509de4f48 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileList/fileList.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/fileList/fileList.data.ts
@@ -1,62 +1,54 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ action: true,
+ columns: [
+ {
+ title: '文件名',
+ field: 'name'
},
- detail: {
- show: false
- }
- },
- {
- label: '文件名',
- field: 'path',
- search: {
- show: true
- }
- },
- {
- label: 'URL',
- field: 'url'
- },
- {
- label: '文件类型',
- field: 'type'
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '文件路径',
+ field: 'path',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: 'URL',
+ field: 'url',
+ table: {
+ cellRender: {
+ name: 'XImg'
+ }
+ }
+ },
+ {
+ title: '文件大小',
+ field: 'size',
+ formatter: 'formatSize'
+ },
+ {
+ title: '文件类型',
+ field: 'type',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '300px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
index 8a207c2e5..5c6295845 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
@@ -1,156 +1,34 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
index dea49218a..94c33eb47 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue
@@ -1,106 +1,39 @@
-
-
-
-
-
-
-
+
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/index.vue b/yudao-ui-admin-vue3/src/views/infra/job/index.vue
index e5b9fff9e..ad02dfbe1 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/job/index.vue
@@ -1,26 +1,159 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts b/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts
index 50bba5cd9..aa568c2be 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts
@@ -2,9 +2,8 @@ import { reactive } from 'vue'
import { DICT_TYPE } from '@/utils/dict'
import { required } from '@/utils/formRules'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
-// 国际化
-const { t } = useI18n()
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+const { t } = useI18n() // 国际化
// 表单校验
export const rules = reactive({
name: [required],
@@ -14,86 +13,61 @@ export const rules = reactive({
retryInterval: [required]
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '任务编号',
+ action: true,
+ actionWidth: '280px',
+ columns: [
+ {
+ title: '任务名称',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '任务名称',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.INFRA_JOB_STATUS,
- form: {
- show: false
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.INFRA_JOB_STATUS,
+ dictClass: 'number',
+ isForm: false,
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '处理器的名字',
- field: 'handlerName',
- search: {
- show: true
- }
- },
- {
- label: '处理器的参数',
- field: 'handlerParam',
- table: {
- show: false
- }
- },
- {
- label: 'CRON 表达式',
- field: 'cronExpression'
- },
- {
- label: '重试次数',
- field: 'retryCount',
- table: {
- show: false
- }
- },
- {
- label: '重试间隔',
- field: 'retryInterval',
- table: {
- show: false
- }
- },
- {
- label: '监控超时时间',
- field: 'monitorTimeout',
- table: {
- show: false
- }
- },
- {
- field: 'action',
- width: '500px',
- label: t('table.action'),
- form: {
- show: false
+ {
+ title: '处理器的名字',
+ field: 'handlerName',
+ isSearch: true
},
- detail: {
- show: false
+ {
+ title: '处理器的参数',
+ field: 'handlerParam',
+ isTable: false
+ },
+ {
+ title: 'CRON 表达式',
+ field: 'cronExpression'
+ },
+ {
+ title: '后续执行时间',
+ field: 'nextTimes',
+ isTable: false,
+ isForm: false
+ },
+ {
+ title: '重试次数',
+ field: 'retryCount',
+ isTable: false
+ },
+ {
+ title: '重试间隔',
+ field: 'retryInterval',
+ isTable: false
+ },
+ {
+ title: '监控超时时间',
+ field: 'monitorTimeout',
+ isTable: false
}
- }
-])
-
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts b/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts
index f05100832..5a033ab0e 100644
--- a/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts
@@ -1,94 +1,78 @@
import { reactive } from 'vue'
import { DICT_TYPE } from '@/utils/dict'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
// 国际化
const { t } = useI18n()
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '日志编号',
+ action: true,
+ columns: [
+ {
+ title: '任务编号',
+ field: 'jobId',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '任务编号',
- field: 'jobId',
- search: {
- show: true
- }
- },
- {
- label: '处理器的名字',
- field: 'handlerName',
- search: {
- show: true
- }
- },
- {
- label: '处理器的参数',
- field: 'handlerParam'
- },
- {
- label: '第几次执行',
- field: 'executeIndex'
- },
- {
- label: '开始执行时间',
- field: 'beginTime',
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'date',
- valueFormat: 'YYYY-MM-DD HH:mm:ss'
- }
- }
- },
- {
- label: '结束执行时间',
- field: 'endTime',
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'date',
- valueFormat: 'YYYY-MM-DD HH:mm:ss'
+ {
+ title: '处理器的名字',
+ field: 'handlerName',
+ isSearch: true
+ },
+ {
+ title: '处理器的参数',
+ field: 'handlerParam'
+ },
+ {
+ title: '第几次执行',
+ field: 'executeIndex'
+ },
+ {
+ title: '开始执行时间',
+ field: 'beginTime',
+ formatter: 'formatDate',
+ table: {
+ slots: {
+ default: 'beginTime_default'
+ }
+ },
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataPicker'
+ }
}
},
- table: {
- show: false
- }
- },
- {
- label: '执行时长',
- field: 'duration'
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.INFRA_JOB_LOG_STATUS,
- search: {
- show: true
- }
- },
- {
- field: 'action',
- width: '100px',
- label: t('table.action'),
- form: {
- show: false
+ {
+ title: '结束执行时间',
+ field: 'endTime',
+ formatter: 'formatDate',
+ isTable: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataPicker'
+ }
+ }
},
- detail: {
- show: false
+ {
+ title: '执行时长',
+ field: 'duration',
+ table: {
+ slots: {
+ default: 'duration_default'
+ }
+ }
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.INFRA_JOB_LOG_STATUS,
+ dictClass: 'number',
+ isSearch: true
}
- }
-])
-
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/infra/redis/index.vue b/yudao-ui-admin-vue3/src/views/infra/redis/index.vue
index cdcae262b..b4689b7aa 100644
--- a/yudao-ui-admin-vue3/src/views/infra/redis/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/redis/index.vue
@@ -1,9 +1,131 @@
-
-
-
-
-
-
-
-
- {{ cache?.info?.redis_version }}
-
-
- {{ cache?.info?.redis_mode == 'standalone' ? '单机' : '集群' }}
-
-
- {{ cache?.info?.tcp_port }}
-
-
- {{ cache?.info?.connected_clients }}
-
-
- {{ cache?.info?.uptime_in_days }}
-
-
- {{ cache?.info?.used_memory_human }}
-
-
- {{ cache?.info ? parseFloat(cache?.info?.used_cpu_user_children).toFixed(2) : '' }}
-
-
- {{ cache?.info?.maxmemory_human }}
-
-
- {{ cache?.info?.aof_enabled == '0' ? '否' : '是' }}
-
-
- {{ cache?.info?.rdb_last_bgsave_status }}
-
-
- {{ cache?.dbSize }}
-
-
- {{ cache?.info?.instantaneous_input_kbps }}kps/
- {{ cache?.info?.instantaneous_output_kbps }}kps
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts b/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts
index 544428cba..c26b46131 100644
--- a/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts
+++ b/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -15,66 +15,61 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '编号',
+ action: true,
+ columns: [
+ {
+ title: '应用名',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '应用名',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '商户名称',
- field: 'payMerchant',
- search: {
- show: true
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- search: {
- show: true
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '商户名称',
+ field: 'payMerchant',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '支付结果的回调地址',
+ field: 'payNotifyUrl',
+ isSearch: true
+ },
+ {
+ title: '退款结果的回调地址',
+ field: 'refundNotifyUrl',
+ isSearch: true
+ },
+ {
+ title: '商户名称',
+ field: 'merchantName',
+ isSearch: true
+ },
+ {
+ title: '备注',
+ field: 'remark',
+ isTable: false,
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/pay/app/index.vue b/yudao-ui-admin-vue3/src/views/pay/app/index.vue
index 2968eb6ee..10f5286ec 100644
--- a/yudao-ui-admin-vue3/src/views/pay/app/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/app/index.vue
@@ -1,163 +1,52 @@
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
index e5f3e7ea1..131f45e8e 100644
--- a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue
@@ -1,163 +1,51 @@
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts b/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts
index 53a2dc581..45d8c71e9 100644
--- a/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts
+++ b/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -14,90 +14,61 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '商户编号',
+ action: true,
+ columns: [
+ {
+ title: '商户号',
+ field: 'no',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '商户号',
- field: 'no',
- search: {
- show: true
- }
- },
- {
- label: '商户全称',
- field: 'code',
- search: {
- show: true
- }
- },
- {
- label: '商户简称',
- field: 'shortName',
- search: {
- show: true
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- search: {
- show: true
- }
- },
- {
- label: t('form.remark'),
- field: 'remark',
- form: {
- component: 'Input',
- componentProps: {
- type: 'textarea',
- rows: 4
- },
- colProps: {
- span: 24
+ {
+ title: '商户全称',
+ field: 'code',
+ isSearch: true
+ },
+ {
+ title: '商户简称',
+ field: 'shortName',
+ isSearch: true
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ isTable: false,
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
}
},
- table: {
- show: false
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
- },
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/pay/order/index.vue b/yudao-ui-admin-vue3/src/views/pay/order/index.vue
index 25c482560..e98c2c447 100644
--- a/yudao-ui-admin-vue3/src/views/pay/order/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/order/index.vue
@@ -1,29 +1,68 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts b/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts
index 8cdf1c9b0..ac08006ad 100644
--- a/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts
+++ b/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -23,163 +23,134 @@ export const rules = reactive({
refundAmount: [required]
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '岗位编号',
+ action: true,
+ columns: [
+ {
+ title: '商户编号',
+ field: 'merchantId',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '商户编号',
- field: 'merchantId',
- search: {
- show: true
- }
- },
- {
- label: '应用编号',
- field: 'appId',
- search: {
- show: true
- }
- },
- {
- label: '渠道编号',
- field: 'channelId'
- },
- {
- label: '渠道编码',
- field: 'channelCode',
- search: {
- show: true
- }
- },
- {
- label: '渠道订单号',
- field: 'merchantOrderId',
- search: {
- show: true
- }
- },
- {
- label: '商品标题',
- field: 'subject'
- },
- {
- label: '商品描述',
- field: 'body'
- },
- {
- label: '异步通知地址',
- field: 'notifyUrl'
- },
- {
- label: '回调商户状态',
- field: 'notifyStatus',
- dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS
- },
- {
- label: '支付金额',
- field: 'amount',
- search: {
- show: true
- }
- },
- {
- label: '渠道手续费',
- field: 'channelFeeRate',
- search: {
- show: true
- }
- },
- {
- label: '渠道手续金额',
- field: 'channelFeeAmount',
- search: {
- show: true
- }
- },
- {
- label: '支付状态',
- field: 'status',
- dictType: DICT_TYPE.PAY_ORDER_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '用户 IP',
- field: 'userIp'
- },
- {
- label: '订单失效时间',
- field: 'expireTime'
- },
- {
- label: '订单支付成功时间',
- field: 'successTime'
- },
- {
- label: '订单支付通知时间',
- field: 'notifyTime'
- },
- {
- label: '支付成功的订单拓展单编号',
- field: 'successExtensionId'
- },
- {
- label: '退款状态',
- field: 'refundStatus',
- dictType: DICT_TYPE.PAY_ORDER_REFUND_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '退款次数',
- field: 'refundTimes'
- },
- {
- label: '退款总金额',
- field: 'refundAmount'
- },
- {
- label: '渠道用户编号',
- field: 'channelUserId'
- },
- {
- label: '渠道订单号',
- field: 'channelOrderNo'
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '应用编号',
+ field: 'appId',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '渠道编号',
+ field: 'channelId'
+ },
+ {
+ title: '渠道编码',
+ field: 'channelCode',
+ isSearch: true
+ },
+ {
+ title: '渠道订单号',
+ field: 'merchantOrderId',
+ isSearch: true
+ },
+ {
+ title: '商品标题',
+ field: 'subject'
+ },
+ {
+ title: '商品描述',
+ field: 'body'
+ },
+ {
+ title: '异步通知地址',
+ field: 'notifyUrl'
+ },
+ {
+ title: '回调状态',
+ field: 'notifyStatus',
+ dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS,
+ dictClass: 'number'
+ },
+ {
+ title: '支付金额',
+ field: 'amount',
+ isSearch: true
+ },
+ {
+ title: '渠道手续费',
+ field: 'channelFeeRate',
+ isSearch: true
+ },
+ {
+ title: '渠道手续金额',
+ field: 'channelFeeAmount',
+ isSearch: true
+ },
+ {
+ title: '支付状态',
+ field: 'status',
+ dictType: DICT_TYPE.PAY_ORDER_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '用户 IP',
+ field: 'userIp'
+ },
+ {
+ title: '订单失效时间',
+ field: 'expireTime',
+ formatter: 'formatDate'
+ },
+ {
+ title: '支付时间',
+ field: 'successTime',
+ formatter: 'formatDate'
+ },
+ {
+ title: '支付通知时间',
+ field: 'notifyTime',
+ formatter: 'formatDate'
+ },
+ {
+ title: '拓展编号',
+ field: 'successExtensionId'
+ },
+ {
+ title: '退款状态',
+ field: 'refundStatus',
+ dictType: DICT_TYPE.PAY_ORDER_REFUND_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '退款次数',
+ field: 'refundTimes'
+ },
+ {
+ title: '退款总金额',
+ field: 'refundAmount'
+ },
+ {
+ title: '渠道用户编号',
+ field: 'channelUserId'
+ },
+ {
+ title: '渠道订单号',
+ field: 'channelOrderNo'
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '270px',
- form: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/pay/refund/index.vue b/yudao-ui-admin-vue3/src/views/pay/refund/index.vue
index 1f4315099..2c7856fa6 100644
--- a/yudao-ui-admin-vue3/src/views/pay/refund/index.vue
+++ b/yudao-ui-admin-vue3/src/views/pay/refund/index.vue
@@ -1,111 +1,69 @@
-
-
-
-
-
-
-
-
-
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts b/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts
index 6d1fef177..0f9dce10b 100644
--- a/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts
+++ b/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts
@@ -1,110 +1,176 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '序号',
+ action: true,
+ columns: [
+ {
+ title: '商户编号',
+ field: 'merchantId',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '应用编号',
- field: 'appId',
- search: {
- show: true
- }
- },
- {
- label: '商户名称',
- field: 'merchantName'
- },
- {
- label: '应用名称',
- field: 'appName'
- },
- {
- label: '商品名称',
- field: 'subject'
- },
- {
- label: '商户退款单号',
- field: 'merchantRefundNo'
- },
- {
- label: '商户订单号',
- field: 'merchantOrderId'
- },
- {
- label: '交易订单号',
- field: 'tradeNo'
- },
- {
- label: '支付金额',
- field: 'payAmount'
- },
- {
- label: '退款金额',
- field: 'refundAmount'
- },
- {
- label: '渠道编码',
- field: 'channelCode',
- search: {
- show: true
- }
- },
- {
- label: '退款类型',
- field: 'type',
- dictType: DICT_TYPE.PAY_REFUND_ORDER_TYPE,
- search: {
- show: true
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.PAY_REFUND_ORDER_STATUS,
- search: {
- show: true
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '应用编号',
+ field: 'appId',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '渠道编号',
+ field: 'channelId',
+ isSearch: true
+ },
+ {
+ title: '渠道编码',
+ field: 'channelCode',
+ dictType: DICT_TYPE.PAY_CHANNEL_CODE_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '支付订单编号',
+ field: 'orderId',
+ isSearch: true
+ },
+ {
+ title: '交易订单号',
+ field: 'tradeNo',
+ isSearch: true
+ },
+ {
+ title: '商户订单号',
+ field: 'merchantOrderId',
+ isSearch: true
+ },
+ {
+ title: '商户退款单号',
+ field: 'merchantRefundNo',
+ isSearch: true
+ },
+ {
+ title: '回调地址',
+ field: 'notifyUrl',
+ isSearch: true
+ },
+ {
+ title: '回调状态',
+ field: 'notifyStatus',
+ dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '退款类型',
+ field: 'type',
+ dictType: DICT_TYPE.PAY_REFUND_ORDER_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.PAY_REFUND_ORDER_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '支付金额',
+ field: 'payAmount',
+ formatter: 'formatAmount',
+ isSearch: true
+ },
+ {
+ title: '退款金额',
+ field: 'refundAmount',
+ formatter: 'formatAmount',
+ isSearch: true
+ },
+ {
+ title: '退款原因',
+ field: 'reason',
+ isSearch: true
+ },
+ {
+ title: '用户IP',
+ field: 'userIp',
+ isSearch: true
+ },
+ {
+ title: '渠道订单号',
+ field: 'channelOrderNo',
+ isSearch: true
+ },
+ {
+ title: '渠道退款单号',
+ field: 'channelRefundNo',
+ isSearch: true
+ },
+ {
+ title: '渠道调用报错时',
+ field: 'channelErrorCode'
+ },
+ {
+ title: '渠道调用报错时',
+ field: 'channelErrorMsg'
+ },
+ {
+ title: '支付渠道的额外参数',
+ field: 'channelExtras'
+ },
+ {
+ title: '退款失效时间',
+ field: 'expireTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: '退款成功时间',
+ field: 'successTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: '退款通知时间',
+ field: 'notifyTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
index ae3b5a8b5..2515266f5 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
@@ -1,6 +1,9 @@
-import { required } from '@/utils/formRules'
import { reactive } from 'vue'
-import { FormSchema } from '@/types/form'
+import { useI18n } from '@/hooks/web/useI18n'
+import { required } from '@/utils/formRules'
+import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+const { t } = useI18n() // 国际化
// 表单校验
export const rules = reactive({
@@ -9,64 +12,68 @@ export const rules = reactive({
email: [required],
phone: [
{
- pattern:
- /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/,
+ len: 11,
trigger: 'blur',
message: '请输入正确的手机号码'
}
]
})
-export const modelSchema = reactive([
- {
- label: '上级部门',
- field: 'parentId',
- component: 'Input'
- },
- {
- label: '部门名称',
- field: 'name',
- component: 'Input',
- formItemProps: {
- rules: [required]
- }
- },
- {
- label: '负责人',
- field: 'leaderUserId',
- component: 'Input'
- },
- {
- label: '联系电话',
- field: 'phone',
- component: 'Input'
- },
- {
- label: '邮箱',
- field: 'email',
- component: 'Input'
- },
- {
- label: '显示排序',
- field: 'sort',
- component: 'InputNumber',
- value: 0
- },
- {
- label: '状态',
- field: 'status',
- component: 'RadioButton',
- componentProps: {
- options: [
- {
- label: '开启',
- value: 0
- },
- {
- label: '关闭',
- value: 1
+// CrudSchema
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ columns: [
+ {
+ title: '上级部门',
+ field: 'parentId',
+ isTable: false
+ },
+ {
+ title: '部门名称',
+ field: 'name',
+ isSearch: true,
+ table: {
+ treeNode: true,
+ align: 'left'
+ }
+ },
+ {
+ title: '负责人',
+ field: 'leaderUserId',
+ table: {
+ slots: {
+ default: 'leaderUserId_default'
}
- ]
+ }
+ },
+ {
+ title: '联系电话',
+ field: 'phone'
+ },
+ {
+ title: '邮箱',
+ field: 'email',
+ isTable: false
+ },
+ {
+ title: '显示排序',
+ field: 'sort'
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false
}
- }
-])
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/index.vue b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
index 43c356bda..6a5b50e66 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
@@ -1,236 +1,199 @@
-
-
- ([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+export const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ actionWidth: '140px',
+ searchSpan: 12,
+ columns: [
+ {
+ title: '字典类型',
+ field: 'dictType',
+ isTable: false,
+ isForm: false
},
- detail: {
- show: false
- }
- },
- {
- label: '字典类型',
- field: 'dictType',
- table: {
- show: false
+ {
+ title: '数据标签',
+ field: 'label',
+ isSearch: true
},
- form: {
- show: false
- }
- },
- {
- label: '数据标签',
- field: 'label',
- search: {
- show: true
- }
- },
- {
- label: '数据键值',
- field: 'value'
- },
- {
- label: '颜色类型',
- field: 'colorType',
- form: {
- component: 'Select',
- componentProps: {
- options: [
- {
- label: 'default',
- value: ''
- },
- {
- label: 'success',
- value: 'success'
- },
- {
- label: 'info',
- value: 'info'
- },
- {
- label: 'warning',
- value: 'warning'
- },
- {
- label: 'danger',
- value: 'danger'
- }
- ]
- }
+ {
+ title: '数据键值',
+ field: 'value'
},
- table: {
- show: false
- }
- },
- {
- label: 'CSS Class',
- field: 'cssClass',
- table: {
- show: false
- }
- },
- {
- label: '显示排序',
- field: 'sort',
- table: {
- show: false
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS
- },
- {
- label: t('form.remark'),
- field: 'remark',
- form: {
- component: 'Input',
- componentProps: {
- type: 'textarea',
- rows: 4
+ {
+ title: '颜色类型',
+ field: 'colorType',
+ form: {
+ component: 'Select',
+ componentProps: {
+ options: [
+ {
+ label: 'default',
+ value: ''
+ },
+ {
+ label: 'success',
+ value: 'success'
+ },
+ {
+ label: 'info',
+ value: 'info'
+ },
+ {
+ label: 'warning',
+ value: 'warning'
+ },
+ {
+ label: 'danger',
+ value: 'danger'
+ }
+ ]
+ }
},
- colProps: {
- span: 24
- }
+ isTable: false
},
- table: {
- show: false
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '180px',
- form: {
- show: false
+ {
+ title: 'CSS Class',
+ field: 'cssClass',
+ isTable: false
},
- detail: {
- show: false
+ {
+ title: '显示排序',
+ field: 'sort',
+ isTable: false
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number'
+ },
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
+ },
+ isTable: false
}
- }
-])
-
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts b/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts
index 2328ddd03..347a06729 100644
--- a/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts
+++ b/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts
@@ -2,95 +2,69 @@ import { reactive } from 'vue'
import { DICT_TYPE } from '@/utils/dict'
import { required } from '@/utils/formRules'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
-// 国际化
-const { t } = useI18n()
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+const { t } = useI18n() // 国际化
+
// 表单校验
export const dictTypeRules = reactive({
- name: [required],
- type: [required]
+ name: [required]
})
// 新增 + 修改
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ actionWidth: '140px',
+ searchSpan: 12,
+ columns: [
+ {
+ title: '字典名称',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '字典名称',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '字典类型',
- field: 'type',
- search: {
- show: true
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- table: {
- show: false
+ {
+ title: '字典类型',
+ field: 'type',
+ isSearch: true
},
- form: {
- show: false
- },
- detail: {
- show: false
- },
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetimerange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ table: {
+ width: 70
}
- }
- },
- {
- label: t('form.remark'),
- field: 'remark',
- table: {
- show: false
},
- form: {
- componentProps: {
- type: 'textarea',
- rows: 4
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ table: {
+ width: 150
},
- colProps: {
- span: 24
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ isTable: false,
+ form: {
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
}
}
- },
- {
- field: 'action',
- width: '180px',
- label: t('table.action'),
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/dict/index.vue b/yudao-ui-admin-vue3/src/views/system/dict/index.vue
index b9b1ad807..2f0a83243 100644
--- a/yudao-ui-admin-vue3/src/views/system/dict/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dict/index.vue
@@ -1,60 +1,48 @@
({
primaryKey: 'id',
primaryType: 'seq',
+ primaryTitle: '编号',
action: true,
columns: [
{
title: '错误码类型',
field: 'type',
dictType: DICT_TYPE.SYSTEM_ERROR_CODE_TYPE,
+ dictClass: 'number',
isSearch: true
},
{
@@ -34,15 +38,16 @@ const crudSchemas = reactive({
},
{
title: '错误码错误提示',
- field: 'message'
+ field: 'message',
+ isSearch: true
},
{
title: t('common.createTime'),
field: 'createTime',
formatter: 'formatDate',
isForm: false,
- isSearch: true,
search: {
+ show: true,
itemRender: {
name: 'XDataTimePicker'
}
diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
index 437bab688..2d987ca5d 100644
--- a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
@@ -1,6 +1,8 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts b/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
index 6d97f7b54..2320faa43 100644
--- a/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
@@ -1,80 +1,55 @@
import { reactive } from 'vue'
import { DICT_TYPE } from '@/utils/dict'
-import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
-const { t } = useI18n() // 国际化
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+
+// CrudSchema
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '日志编号',
+ action: true,
+ actionWidth: '100px',
+ columns: [
+ {
+ title: '日志类型',
+ field: 'logType',
+ dictType: DICT_TYPE.SYSTEM_LOGIN_TYPE,
+ dictClass: 'number'
},
- detail: {
- show: false
- }
- },
- {
- label: '日志类型',
- field: 'logType',
- dictType: DICT_TYPE.SYSTEM_LOGIN_TYPE,
- search: {
- show: true
- }
- },
- {
- label: '用户名称',
- field: 'username',
- search: {
- show: true
- }
- },
- {
- label: '登录地址',
- field: 'userIp',
- search: {
- show: true
- }
- },
- {
- label: 'userAgent',
- field: 'userAgent'
- },
- {
- label: '登陆结果',
- field: 'result',
- dictType: DICT_TYPE.SYSTEM_LOGIN_RESULT,
- search: {
- show: true
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '用户名称',
+ field: 'username',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'daterange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '登录地址',
+ field: 'userIp',
+ isSearch: true
+ },
+ {
+ title: '浏览器',
+ field: 'userAgent'
+ },
+ {
+ title: '登陆结果',
+ field: 'result',
+ dictType: DICT_TYPE.SYSTEM_LOGIN_RESULT,
+ dictClass: 'number'
+ },
+ {
+ title: '登录日期',
+ field: 'createTime',
+ formatter: 'formatDate',
+ table: {
+ width: 150
+ },
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '120px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/menu/index.vue b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
index e1bd5c15c..a27effc55 100644
--- a/yudao-ui-admin-vue3/src/views/system/menu/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/menu/index.vue
@@ -1,34 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
- 显示
- 隐藏
-
-
-
-
-
-
-
-
-
- 缓存
- 不缓存
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+ 显示
+ 隐藏
+
+
+
+
+
+
+
+
+
+ 缓存
+ 不缓存
+
+
+
+
+
({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ columns: [
+ {
+ title: '上级菜单',
+ field: 'parentId',
+ isTable: false
+ },
+ {
+ title: '菜单名称',
+ field: 'name',
+ isSearch: true,
+ table: {
+ treeNode: true,
+ align: 'left',
+ width: '200px',
+ slots: {
+ default: 'name_default'
+ }
+ }
+ },
+ {
+ title: '菜单类型',
+ field: 'type',
+ dictType: DICT_TYPE.SYSTEM_MENU_TYPE
+ },
+ {
+ title: '路由地址',
+ field: 'path'
+ },
+ {
+ title: '组件路径',
+ field: 'component'
+ },
+ {
+ title: '权限标识',
+ field: 'permission'
+ },
+ {
+ title: '排序',
+ field: 'sort'
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate'
+ }
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/notice/index.vue b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
index 0d10503f7..239c0b414 100644
--- a/yudao-ui-admin-vue3/src/views/system/notice/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
@@ -1,6 +1,8 @@
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue b/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
index 2023f20dc..2328d3071 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
@@ -1,92 +1,71 @@
-
-
-
-
-
-
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts b/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts
index 50721d0c2..5ab13f7b1 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts
@@ -1,68 +1,51 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ columns: [
+ {
+ title: '用户编号',
+ field: 'userId',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '用户编号',
- field: 'userId',
- search: {
- show: true
- }
- },
- {
- label: '访问令牌',
- field: 'accessToken'
- },
- {
- label: '刷新令牌',
- field: 'refreshToken'
- },
- {
- label: '用户类型',
- field: 'userType',
- dictType: DICT_TYPE.USER_TYPE,
- search: {
- show: true
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
- }
- },
- {
- label: '过期时间',
- field: 'expiresTime',
- form: {
- show: false
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '200px',
- form: {
- show: false
+ {
+ title: '访问令牌',
+ field: 'accessToken'
},
- detail: {
- show: false
+ {
+ title: '刷新令牌',
+ field: 'refreshToken'
+ },
+ {
+ title: '客户端编号',
+ field: 'clientId',
+ isSearch: true
+ },
+ {
+ title: '用户类型',
+ field: 'userType',
+ dictType: DICT_TYPE.USER_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false
+ },
+ {
+ title: '过期时间',
+ field: 'expiresTime',
+ formatter: 'formatDate',
+ isForm: false
}
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue b/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
index b190674ba..a08019d0b 100644
--- a/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
@@ -1,97 +1,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts b/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
index 32188b10e..b28e8f288 100644
--- a/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
@@ -1,113 +1,109 @@
import { reactive } from 'vue'
-import { DICT_TYPE } from '@/utils/dict'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+
const { t } = useI18n() // 国际化
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
- }
- },
- {
- label: '操作模块',
- field: 'module',
- search: {
- show: true
- }
- },
- {
- label: '操作名',
- field: 'name'
- },
- {
- label: '操作类型',
- field: 'type',
- dictType: DICT_TYPE.SYSTEM_OPERATE_TYPE,
- search: {
- show: true
- }
- },
- {
- label: '请求方法名',
- field: 'requestMethod'
- },
- {
- label: '请求地址',
- field: 'requestUrl'
- },
- {
- label: '操作人员',
- field: 'userNickname',
- search: {
- show: true
- }
- },
- {
- label: '操作明细',
- field: 'content',
- table: {
- show: false
- }
- },
- {
- label: '用户 IP',
- field: 'userIp',
- table: {
- show: false
- }
- },
- {
- label: 'userAgent',
- field: 'userAgent'
- },
- {
- label: '操作结果',
- field: 'resultCode',
- search: {
- show: true,
- component: 'Select',
- componentProps: {
- options: [
- { label: '成功', value: true },
- { label: '失败', value: false }
- ]
+
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '日志编号',
+ action: true,
+ actionWidth: '80px',
+ columns: [
+ {
+ title: '操作模块',
+ field: 'module',
+ isSearch: true
+ },
+ {
+ title: '操作名',
+ field: 'name'
+ },
+ {
+ title: '操作类型',
+ field: 'type',
+ dictType: DICT_TYPE.SYSTEM_OPERATE_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '请求方法名',
+ field: 'requestMethod',
+ isTable: false
+ },
+ {
+ title: '请求地址',
+ field: 'requestUrl',
+ isTable: false
+ },
+ {
+ title: '操作人员',
+ field: 'userNickname',
+ isSearch: true
+ },
+ {
+ title: '操作明细',
+ field: 'content',
+ isTable: false
+ },
+ {
+ title: '用户 IP',
+ field: 'userIp',
+ isTable: false
+ },
+ {
+ title: 'userAgent',
+ field: 'userAgent'
+ },
+ {
+ title: '操作结果',
+ field: 'resultCode',
+ table: {
+ slots: {
+ default: 'resultCode'
+ }
+ }
+ },
+ {
+ title: '操作结果',
+ field: 'success',
+ isTable: false,
+ isDetail: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: '$select',
+ props: { placeholder: t('common.selectText') },
+ options: [
+ { label: '成功', value: 'true' },
+ { label: '失败', value: 'false' }
+ ]
+ }
+ }
+ },
+ {
+ title: '操作日期',
+ field: 'startTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: '执行时长',
+ field: 'duration',
+ table: {
+ slots: {
+ default: 'duration'
+ }
}
}
- },
- {
- label: '操作日期',
- field: 'startTime',
- form: {
- show: false
- },
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'daterange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
- }
- }
- },
- {
- label: '执行时长',
- field: 'duration'
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '120px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue
index 160113009..ecd190c34 100644
--- a/yudao-ui-admin-vue3/src/views/system/post/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue
@@ -2,8 +2,8 @@
-
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
- {{ dataScopeForm.name }}
- {{ dataScopeForm.code }}
@@ -328,7 +105,7 @@ onMounted(() => {
actionScopeType === 'menu' || dataScopeForm.dataScope === SystemDataScopeEnum.DEPT_CUSTOM
"
>
-
+
父子联动(选中父节点，自动选择子节点):
-
- {{ t('action.save') }}
-
- {{ t('dialog.close') }}
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/role/role.data.ts b/yudao-ui-admin-vue3/src/views/system/role/role.data.ts
index 5bfc4f04f..172b8c892 100644
--- a/yudao-ui-admin-vue3/src/views/system/role/role.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/role/role.data.ts
@@ -2,7 +2,7 @@ import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
import { DICT_TYPE } from '@/utils/dict'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
// 国际化
const { t } = useI18n()
// 表单校验
@@ -12,82 +12,68 @@ export const rules = reactive({
sort: [required]
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryTitle: '角色编号',
+ primaryType: 'seq',
+ action: true,
+ actionWidth: '400px',
+ columns: [
+ {
+ title: '角色名称',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '角色名称',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '角色类型',
- field: 'type',
- dictType: DICT_TYPE.SYSTEM_ROLE_TYPE
- },
- {
- label: '角色标识',
- field: 'code',
- search: {
- show: true
- }
- },
- {
- label: '显示顺序',
- field: 'sort',
- form: {
- component: 'InputNumber',
- value: 0
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- search: {
- show: true
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '角色类型',
+ field: 'type',
+ dictType: DICT_TYPE.SYSTEM_ROLE_TYPE,
+ dictClass: 'number',
+ isForm: false
},
- detail: {
- show: false
+ {
+ title: '角色标识',
+ field: 'code',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'daterange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '显示顺序',
+ field: 'sort'
+ },
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ isTable: false,
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
+ }
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- field: 'action',
- width: '450px',
- label: t('table.action'),
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
index 5dbd6f5ea..f7b82e52e 100644
--- a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue
@@ -1,135 +1,80 @@
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts
index 8aa1b71c0..06b5849e1 100644
--- a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -12,68 +12,67 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '敏感词编号',
+ action: true,
+ columns: [
+ {
+ title: '敏感词',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '敏感词',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '标签',
- field: 'tags'
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '描述',
- field: 'description',
- form: {
- component: 'Input',
- componentProps: {
- type: 'textarea',
- rows: 4
- },
- colProps: {
- span: 24
+ {
+ title: '标签',
+ field: 'tag',
+ isTable: false,
+ isForm: false,
+ isDetail: false,
+ isSearch: true
+ },
+ {
+ title: '标签',
+ field: 'tags',
+ table: {
+ slots: {
+ default: 'tags_default'
+ }
+ }
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '描述',
+ field: 'description',
+ form: {
+ component: 'Input',
+ componentProps: {
+ type: 'textarea',
+ rows: 4
+ },
+ colProps: {
+ span: 24
+ }
+ }
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
index bb77f2e02..52f93d37a 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue
@@ -1,157 +1,44 @@
-
-
-
-
-
-
-
-
-
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
index b750fc3e2..14f438fdc 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -14,79 +14,54 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '渠道编号',
+ action: true,
+ columns: [
+ {
+ title: '短信签名',
+ field: 'signature',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '短信签名',
- field: 'signature',
- search: {
- show: true
- }
- },
- {
- label: '渠道编码',
- field: 'code',
- dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
- search: {
- show: true
- }
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '短信 API 的账号',
- field: 'apiKey'
- },
- {
- label: '短信 API 的密钥',
- field: 'apiSecret'
- },
- {
- label: '短信发送回调 URL',
- field: 'callbackUrl'
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '渠道编码',
+ field: 'code',
+ dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'daterange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '短信 API 的账号',
+ field: 'apiKey'
+ },
+ {
+ title: '短信 API 的密钥',
+ field: 'apiSecret'
+ },
+ {
+ title: '短信发送回调 URL',
+ field: 'callbackUrl'
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
index 9bc3e0d69..d38f17baf 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/index.vue
@@ -1,99 +1,67 @@
-
-
-
-
-
-
-
-
+
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
index 7ba6fbf7a..29bedef14 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
@@ -1,105 +1,85 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '日志编号',
+ action: true,
+ columns: [
+ {
+ title: '手机号',
+ field: 'mobile',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '手机号',
- field: 'mobile',
- search: {
- show: true
- }
- },
- {
- label: '短信内容',
- field: 'templateContent'
- },
- {
- label: '短信渠道',
- field: 'channelId',
- dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
- search: {
- show: true
- }
- },
- {
- label: '发送状态',
- field: 'sendStatus',
- dictType: DICT_TYPE.SYSTEM_SMS_SEND_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '接收状态',
- field: 'receiveTime',
- dictType: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS,
- search: {
- show: true
- }
- },
- {
- label: '模板编号',
- field: 'templateId',
- search: {
- show: true
- }
- },
- {
- label: '短信类型',
- field: 'channelId',
- dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE,
- search: {
- show: true
- }
- },
- {
- label: '接收时间',
- field: 'receiveTime',
- form: {
- show: false
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '短信内容',
+ field: 'templateContent'
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'daterange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '模板编号',
+ field: 'templateId',
+ isSearch: true
+ },
+ {
+ title: '短信渠道',
+ field: 'channelId',
+ dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '发送状态',
+ field: 'sendStatus',
+ dictType: DICT_TYPE.SYSTEM_SMS_SEND_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '发送时间',
+ field: 'sendTime',
+ formatter: 'formatDate',
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '80px',
- form: {
- show: false
},
- detail: {
- show: false
+ {
+ title: '短信类型',
+ field: 'templateType',
+ dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '接收状态',
+ field: 'receiveStatus',
+ dictType: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: '接收时间',
+ field: 'receiveTime',
+ formatter: 'formatDate',
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
+ }
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate'
}
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
index e1c192eee..9edffe907 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
@@ -1,205 +1,49 @@
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
index 55a1c8d67..c088485bc 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
@@ -1,8 +1,8 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
@@ -17,86 +17,69 @@ export const rules = reactive({
})
// CrudSchema
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: 'seq',
+ primaryTitle: '模板编号',
+ action: true,
+ actionWidth: '280',
+ columns: [
+ {
+ title: '模板编码',
+ field: 'code',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '模板编码',
- field: 'code',
- search: {
- show: true
- }
- },
- {
- label: '模板名称',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '模板内容',
- field: 'content'
- },
- {
- label: '短信 API 的模板编号',
- field: 'apiTemplateId',
- search: {
- show: true
- }
- },
- {
- label: '短信类型',
- field: 'type',
- dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE
- },
- {
- label: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS
- },
- {
- label: t('form.remark'),
- field: 'remark',
- table: {
- show: false
- }
- },
- {
- label: t('common.createTime'),
- field: 'createTime',
- form: {
- show: false
+ {
+ title: '模板名称',
+ field: 'name',
+ isSearch: true
},
- search: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'daterange',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
+ {
+ title: '模板内容',
+ field: 'content'
+ },
+ {
+ title: '短信 API 的模板编号',
+ field: 'apiTemplateId',
+ isSearch: true
+ },
+ {
+ title: '短信类型',
+ field: 'type',
+ dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE,
+ dictClass: 'number',
+ isSearch: true,
+ table: {
+ width: 80
+ }
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true,
+ table: {
+ width: 80
+ }
+ },
+ {
+ title: t('form.remark'),
+ field: 'remark',
+ isTable: false
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '320px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
index 696d15e96..f7cf6cab1 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
@@ -1,48 +1,126 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
index 64eb63d0c..01eafc924 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
@@ -1,9 +1,25 @@
import { reactive } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { required } from '@/utils/formRules'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+import { getTenantPackageList, TenantPackageVO } from '@/api/system/tenantPackage'
+import { ComponentOptions } from '@/types/components'
const { t } = useI18n() // 国际化
+export const tenantPackageOption: ComponentOptions[] = []
+const getTenantPackageOptions = async () => {
+ const res = await getTenantPackageList()
+ res.forEach((tenantPackage: TenantPackageVO) => {
+ tenantPackageOption.push({
+ key: tenantPackage.id,
+ value: tenantPackage.id,
+ label: tenantPackage.name
+ })
+ })
+
+ return tenantPackageOption
+}
+getTenantPackageOptions()
// 表单校验
export const rules = reactive({
@@ -18,115 +34,104 @@ export const rules = reactive({
})
// CrudSchema.
-const crudSchemas = reactive([
- {
- label: t('common.index'),
- field: 'id',
- type: 'index',
- form: {
- show: false
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryTitle: '租户编号',
+ primaryType: 'seq',
+ action: true,
+ columns: [
+ {
+ title: '租户名称',
+ field: 'name',
+ isSearch: true
},
- detail: {
- show: false
- }
- },
- {
- label: '租户名称',
- field: 'name',
- search: {
- show: true
- }
- },
- {
- label: '租户套餐',
- field: 'packageId'
- },
- {
- label: '联系人',
- field: 'contactName',
- search: {
- show: true
- }
- },
- {
- label: '联系手机',
- field: 'contactMobile',
- search: {
- show: true
- }
- },
- {
- label: '用户名称',
- field: 'username',
- table: {
- show: false
+ {
+ title: '租户套餐',
+ field: 'packageId',
+ table: {
+ slots: {
+ default: 'packageId_default'
+ }
+ },
+ form: {
+ component: 'Select',
+ componentProps: {
+ options: tenantPackageOption
+ }
+ }
},
- detail: {
- show: false
- }
- },
- {
- label: '用户密码',
- field: 'password',
- table: {
- show: false
+ {
+ title: '联系人',
+ field: 'contactName',
+ isSearch: true
},
- detail: {
- show: false
+ {
+ title: '联系手机',
+ field: 'contactMobile',
+ isSearch: true
},
- form: {
- component: 'InputPassword'
- }
- },
- {
- label: '账号额度',
- field: 'accountCount',
- form: {
- component: 'InputNumber',
- value: 0
- }
- },
- {
- label: '过期时间',
- field: 'expireTime',
- form: {
- show: true,
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- valueFormat: 'x'
+ {
+ title: '用户名称',
+ field: 'username',
+ isTable: false,
+ isDetail: false
+ },
+ {
+ title: '用户密码',
+ field: 'password',
+ isTable: false,
+ isDetail: false,
+ form: {
+ component: 'InputPassword'
+ }
+ },
+ {
+ title: '账号额度',
+ field: 'accountCount',
+ table: {
+ slots: {
+ default: 'accountCount_default'
+ }
+ },
+ form: {
+ component: 'InputNumber'
+ }
+ },
+ {
+ title: '过期时间',
+ field: 'expireTime',
+ formatter: 'formatDate',
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ }
+ },
+ {
+ title: '绑定域名',
+ field: 'domain'
+ },
+ {
+ title: '租户状态',
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('table.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate',
+ isForm: false,
+ search: {
+ show: true,
+ itemRender: {
+ name: 'XDataTimePicker'
+ }
}
}
- },
- {
- label: '绑定域名',
- field: 'domain'
- },
- {
- label: '租户状态',
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- search: {
- show: true
- }
- },
- {
- label: t('table.createTime'),
- field: 'createTime',
- form: {
- show: false
- }
- },
- {
- label: t('table.action'),
- field: 'action',
- width: '240px',
- form: {
- show: false
- },
- detail: {
- show: false
- }
- }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue b/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
index 9d2cd4970..c45e9adc0 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue
@@ -1,158 +1,22 @@
-
-
-
-
-
-
-
-
-
+
-
-
@@ -50,9 +50,7 @@ onMounted(() => {
-
diff --git a/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue b/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue
index 96ae7cad5..a5a9e56a6 100644
--- a/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue
+++ b/yudao-ui-admin-vue3/src/components/Crontab/src/Crontab.vue
@@ -1,18 +1,7 @@
-
-
-
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/Cropper.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/Cropper.vue
new file mode 100644
index 000000000..2e38e06d0
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/Cropper.vue
@@ -0,0 +1,190 @@
+
+
+ ![]()
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
new file mode 100644
index 000000000..455f9f005
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
@@ -0,0 +1,136 @@
+
+
+ ![avatar]()
+
+ {{ btnText ? btnText : t('cropper.selectImage') }}
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/types.ts b/yudao-ui-admin-vue3/src/components/Cropper/src/types.ts
new file mode 100644
index 000000000..bcad3b450
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/types.ts
@@ -0,0 +1,8 @@
+import type Cropper from 'cropperjs'
+
+export interface CropendResult {
+ imgBase64: string
+ imgInfo: Cropper.Data
+}
+
+export type { Cropper }
diff --git a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
index 2e55512cc..ac395de47 100644
--- a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
+++ b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue
@@ -19,6 +19,7 @@ const props = defineProps({
title: propTypes.string.def(''),
message: propTypes.string.def(''),
collapse: propTypes.bool.def(true),
+ columns: propTypes.number.def(1),
schema: {
type: Array as PropType
+
+
+ ![]()
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/UploadFile/src/UploadImgs.vue b/yudao-ui-admin-vue3/src/components/UploadFile/src/UploadImgs.vue
new file mode 100644
index 000000000..22444c6f7
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/UploadFile/src/UploadImgs.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify.vue b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify.vue
index 70bfce7ef..a6c391078 100644
--- a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify.vue
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify.vue
@@ -2,7 +2,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
{{ t('captcha.verification') }}
@@ -10,7 +10,7 @@
-
+
-
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue
index 2d59023bd..0fdbb1cbd 100644
--- a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue
@@ -71,14 +71,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
- {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
-
-
- {{ t('workplace.toady') }}，20℃ - 32℃！
-
-
-
-
-
- {{ t('workplace.project') }}
-
-
- {{ t('workplace.toDo') }}
-
-
- {{ t('workplace.access') }}
-
- {{ t('workplace.project') }}
- {{ t('workplace.more') }}
-
-
-
-
- {{ t(item.message) }}
-
- {{ item.personal }}
- {{ formatTime(item.time, 'yyyy-MM-dd') }}
-
-
-
- {{ item.name }}
-
-
-
- {{ t('workplace.notice') }}
- {{ t('workplace.more') }}
-
-
-
-
-
- ![]()
-
-
-
-
-
- {{ item.type }} : {{ item.title }}
-
-
-
- {{ formatTime(item.date, 'yyyy-MM-dd') }}
-
- {{ row.title }}
+
+
+
已绑定
- (解绑)
-
-
+ (绑定)
-
+ index
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
index a49d911f3..efa4f56b6 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/index.vue
@@ -1,4 +1,4 @@
-
-
index
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue b/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
index 348b07ca2..8ac48bd40 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/task/todo/index.vue
@@ -1,4 +1,4 @@
-
-
index
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts
index 69423dd9d..817145e32 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts
+++ b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts
@@ -1,87 +1,75 @@
import { reactive } from 'vue'
-import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
import { DICT_TYPE } from '@/utils/dict'
-const { t } = useI18n() // 国际化
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
// CrudSchema
-const crudSchemas = reactiveindex
-
-
+
diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
index 91bf847d0..7c4349df5 100644
--- a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue
@@ -1,35 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.code }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts b/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts
index 6c869dbd8..3a0016045 100644
--- a/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts
@@ -2,130 +2,101 @@ import { reactive } from 'vue'
import { DICT_TYPE } from '@/utils/dict'
import { required } from '@/utils/formRules'
import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
// 国际化
const { t } = useI18n()
// 表单校验
export const dictDataRules = reactive({
- label: [required],
+ title: [required],
value: [required],
sort: [required]
})
// crudSchemas
-export const crudSchemas = reactive
- 部门列表
-
- 新增根节点
-
-
-
-
-
-
-
-
-
- {{ node.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formTitle }}
-
-
-
-
- 请从左侧选择部门
-
-
-
-
-
- {{ t('action.save') }}
-
- {{ t('common.cancel') }}
-
-
+
-
-
+
+
+
-
-
-
-
+
+
-
diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
index 92bcbebbd..c6af9fbe0 100644
--- a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
@@ -4,22 +4,26 @@ import { useI18n } from '@/hooks/web/useI18n'
import { DICT_TYPE } from '@/utils/dict'
import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
+
// 表单校验
export const rules = reactive({
applicationName: [required],
code: [required],
message: [required]
})
+
// 新增 + 修改
const crudSchemas = reactive
字典分类
-
-
-
-
@@ -66,68 +54,57 @@
请从左侧选择
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-