diff --git a/src/views/lowdesign/tableDesign/index.vue b/src/views/lowdesign/tableDesign/index.vue
index 2457e66..dbfce57 100644
--- a/src/views/lowdesign/tableDesign/index.vue
+++ b/src/views/lowdesign/tableDesign/index.vue
@@ -41,7 +41,7 @@
>
-
+
AI建表
-
+
自定义按钮
-
+
前端增强
@@ -74,7 +74,7 @@
@click="menuLeftHandle('sql')"
v-hasPermi="['jeelowcode:sql']"
>
-
+
SQL增强
-
+
JAVA增强
+
+
+
+ 批量同步
+
+
@@ -107,7 +118,7 @@
更多
-
+
@@ -190,7 +201,8 @@
@click="openDataOrigin"
:disabled="!tableForm.dataOrigin"
>
- 数据源SQL配置
+
+ 数据源SQL配置
表格扩展配置
- 默认排序
+
+ 默认排序
- 默认搜索
+
+ 默认搜索
@@ -300,7 +314,7 @@
- {{ item.label }}{{ item.value }}
+ {{ item.label }}{{ item.value }}
@@ -417,7 +431,8 @@
size="small"
type="primary"
@click="copySampleStr(key)"
- >点击复制点击复制
+
@@ -462,32 +477,32 @@ import {
DataOriginOption,
AuthConfig
} from './components'
-import { TipView } from '../general/components/index'
+import {TipView} from '../general/components/index'
import * as TableApi from '@/api/design/table'
import * as JsApi from '@/api/design/table/jsEnhance'
-import { dicObj, pageOption, tableInfoOption } from './designData'
-import { scssEnhanceExample, controlInitExample } from '@/components/LowDesign/src/utils/example'
-import { formattingLengStr } from '@/utils/lowDesign'
+import {dicObj, pageOption, tableInfoOption} from './designData'
+import {scssEnhanceExample, controlInitExample} from '@/components/LowDesign/src/utils/example'
+import {formattingLengStr} from '@/utils/lowDesign'
import controlPath from '@/components/LowDesign/src/controlPath'
import useMEDialog from '@/hooks/design/useMEDialog'
import useCopyText from '@/hooks/design/useCopyText'
-import { ElButton, ElLoading } from 'element-plus'
-import { cloneDeep } from 'lodash-es'
-import { useRenderVxeColumn } from '../general/components/useRenderVxeColumn'
-import { useGroup } from '@/hooks/design/useGroup'
-import { checkPermi } from '@/utils/permission'
-import { ElMessage } from 'element-plus'
+import {ElButton, ElLoading} from 'element-plus'
+import {cloneDeep} from 'lodash-es'
+import {useRenderVxeColumn} from '../general/components/useRenderVxeColumn'
+import {useGroup} from '@/hooks/design/useGroup'
+import {checkPermi} from '@/utils/permission'
+import {ElMessage} from 'element-plus'
-defineOptions({ name: 'TableDesign' })
+defineOptions({name: 'TableDesign'})
-const { MEDialog, MEData, openMEDialog } = useMEDialog()
-const { copyText } = useCopyText()
+const {MEDialog, MEData, openMEDialog} = useMEDialog()
+const {copyText} = useCopyText()
useRenderVxeColumn()
const message = useMessage() // 消息弹窗
const router = useRouter() // 路由
-const { t } = useI18n() // 国际化
-const { getCurrPermi } = useCrudPermi()
+const {t} = useI18n() // 国际化
+const {getCurrPermi} = useCrudPermi()
const loading = ref(true) // 列表的加载中
const saveLoading = ref(false)
@@ -555,7 +570,7 @@ const authPopup = ref({
show: false,
vBind: {}
})
-const aiCreatedObj = ref({ popup: false, loading: false, describe: '', timer: null as any })
+const aiCreatedObj = ref({popup: false, loading: false, describe: '', timer: null as any})
const basicPopup = ref({
show: false,
@@ -580,9 +595,9 @@ const samplePopup = ref(false)
const permission = getCurrPermi(['jeelowcode:dbform'])
const tableConfigList = [
- { label: '表格选择', prop: 'tableSelect', valClass: 'w-75px!' },
- { label: '搜索样式', prop: 'searchStyle', valClass: 'w-100px!' },
- { label: '操作栏样式', prop: 'operateMenuStyle', labelWidth: '90px', valClass: 'w-100px!' },
+ {label: '表格选择', prop: 'tableSelect', valClass: 'w-75px!'},
+ {label: '搜索样式', prop: 'searchStyle', valClass: 'w-100px!'},
+ {label: '操作栏样式', prop: 'operateMenuStyle', labelWidth: '90px', valClass: 'w-100px!'},
{
label: '操作栏最大横排数',
prop: 'maxMenuNum',
@@ -598,7 +613,7 @@ const tableConfigList = [
showKey: 'tableType',
showVal: 1,
valClass: 'w-114px!',
- changeFun: ({ value }) => {
+ changeFun: ({value}) => {
let dicData = cloneDeep(dicObj.tableConfig)
if (value == 'card') {
dicData = dicData.filter(
@@ -632,8 +647,8 @@ const tableConfigList = [
showVal: 'expand',
valClass: 'w-90px!'
},
- { label: '树表样式', prop: 'treeStyle', showKey: 'tableType', showVal: 2 },
- { label: '树表模式', prop: 'treeMode', showKey: 'tableType', showVal: 2 }
+ {label: '树表样式', prop: 'treeStyle', showKey: 'tableType', showVal: 2},
+ {label: '树表模式', prop: 'treeMode', showKey: 'tableType', showVal: 2}
]
const menuMoreList = [
@@ -642,14 +657,14 @@ const menuMoreList = [
type: 'sync',
isShow: (row) => row.isDbSync == 'N' && checkPermi(['jeelowcode:dbform:sync'])
},
- { label: '功能测试', type: 'test' },
- { label: '路由地址', type: 'address' },
- { label: '接口地址', type: 'apiUrl' },
- { label: '租户权限配置', type: 'auth' },
- { label: '复制表', type: 'copy', isShow: () => checkPermi(['jeelowcode:dbform:create']) },
- { label: 'js增强解锁', type: 'jsUnlock', isShow: () => checkPermi(['jeelowcode:web']) },
- { label: 'scss增强解锁', type: 'scssUnlock', isShow: () => checkPermi(['jeelowcode:web']) },
- { label: '删除', type: 'del', isShow: () => checkPermi(['jeelowcode:dbform:delete']) }
+ {label: '功能测试', type: 'test'},
+ {label: '路由地址', type: 'address'},
+ {label: '接口地址', type: 'apiUrl'},
+ {label: '租户权限配置', type: 'auth'},
+ {label: '复制表', type: 'copy', isShow: () => checkPermi(['jeelowcode:dbform:create'])},
+ {label: 'js增强解锁', type: 'jsUnlock', isShow: () => checkPermi(['jeelowcode:web'])},
+ {label: 'scss增强解锁', type: 'scssUnlock', isShow: () => checkPermi(['jeelowcode:web'])},
+ {label: '删除', type: 'del', isShow: () => checkPermi(['jeelowcode:dbform:delete'])}
]
useCrudHeight(crudRef)
@@ -747,8 +762,8 @@ const tableFormVerify = (type) => {
customFormRef.value.validate((bool, done, msg) => {
done()
if (!bool) return reject(msg)
- const { tableName, tableType, tableClassify } = tableForm.value
- const subTable = { bool: true, len: 0 }
+ const {tableName, tableType, tableClassify} = tableForm.value
+ const subTable = {bool: true, len: 0}
if (tableClassify == 2 && tableName && tableName.indexOf('view_') != 0) {
message.warning('视图表的表名请以 view_ 开头')
return reject('message')
@@ -813,7 +828,7 @@ const tableFormVerify = (type) => {
if (messageText) {
handleVerifyError(tabKey, item._X_ROW_KEY, index)
- ElMessage({ dangerouslyUseHTMLString: true, message: messageText })
+ ElMessage({dangerouslyUseHTMLString: true, message: messageText})
errText = 'message'
break
}
@@ -846,7 +861,7 @@ const tableFormVerify = (type) => {
: ''
}
if (key == 'summaryList') {
- const { sqlType, sqlValue } = item.summaryJson
+ const {sqlType, sqlValue} = item.summaryJson
itemObj.summaryType = 'bottom'
itemObj.summarySql = sqlType == 'custom' ? sqlValue : sqlType
itemObj.summaryJson = JSON.stringify(item.summaryJson)
@@ -927,7 +942,7 @@ const contrastEditData = (infoData) => {
for (const k in item) {
if (item[k] != contrastObj[k]) {
item.isModify = 'Y'
- break
+ break
}
}
}
@@ -938,7 +953,7 @@ const contrastEditData = (infoData) => {
}
const setApiDetailData = (data) => {
- apiDetailData.value = { delIdVo: {} }
+ apiDetailData.value = {delIdVo: {}}
for (const key in data) {
let listKey = key
if (['summaryBottomList', 'summaryTopList'].includes(listKey)) listKey = 'summaryList'
@@ -990,9 +1005,9 @@ const menuLeftHandle = (type) => {
if (aiCreatedObj.value.timer) clearInterval(aiCreatedObj.value.timer)
}
}
-const menuHandle = async ({ type, row, index }) => {
+const menuHandle = async ({type, row, index}) => {
if (type == 'edit') crudRef.value.rowEdit(row, index)
- else if (type == 'test') router.push({ path: '/low/table/test/' + row.id })
+ else if (type == 'test') router.push({path: '/low/table/test/' + row.id})
else if (type == 'sync') syncDbTable(row)
else if (type == 'address') showAddress(row)
else if (type == 'apiUrl') showApiUrl(row)
@@ -1002,7 +1017,7 @@ const menuHandle = async ({ type, row, index }) => {
else if (type == 'auth') {
authPopup.value = {
show: true,
- vBind: { dbformId: row.id, tableName: row.tableName, tableDescribe: row.tableDescribe }
+ vBind: {dbformId: row.id, tableName: row.tableName, tableDescribe: row.tableDescribe}
}
}
}
@@ -1014,7 +1029,7 @@ const syncDbTable = (row) => {
title: '同步数据库',
width: '400px',
isCenter: true,
- dialogParams: { alignCenter: true },
+ dialogParams: {alignCenter: true},
footerBtn: [
{
name: '取 消',
@@ -1023,7 +1038,7 @@ const syncDbTable = (row) => {
{
name: '确 定',
loading: true,
- params: { type: 'primary' },
+ params: {type: 'primary'},
clickFun: async (done) => {
if (syncData.value.value == 'force') {
await message.prompt(
@@ -1086,7 +1101,7 @@ const showApiUrl = async (row) => {
value: `/jeelowcode/${isOpen ? 'open' : 'dbform-data'}/save/batch/${row.id}`,
tipText: '接口参数格式:data:[ { 新增的数据... },{ ... } ]'
},
- { label: '编辑数据[put]', value: `/jeelowcode/dbform-data/edit/${row.id}` },
+ {label: '编辑数据[put]', value: `/jeelowcode/dbform-data/edit/${row.id}`},
{
label: '批量编辑数据[put]',
value: `/jeelowcode/dbform-data/edit/batch/${row.id}`,
@@ -1107,19 +1122,19 @@ const showApiUrl = async (row) => {
let list: VNode[] = []
apiList.forEach((item) => {
list.push(
- h('div', { style: { marginBottom: '10px', border: ' 1px solid #eee', padding: '10px' } }, [
+ h('div', {style: {marginBottom: '10px', border: ' 1px solid #eee', padding: '10px'}}, [
h('div', [
- h('span', { style: { fontWeight: 600, fontSize: '14px' } }, item.label + ':'),
+ h('span', {style: {fontWeight: 600, fontSize: '14px'}}, item.label + ':'),
h(
ElButton,
- { size: 'small', type: 'primary', onClick: () => copyText(item.value) },
+ {size: 'small', type: 'primary', onClick: () => copyText(item.value)},
() => '复制'
)
]),
- h('div', { style: { fontSize: '12px' } }, item.value),
+ h('div', {style: {fontSize: '12px'}}, item.value),
h(
'div',
- { style: { display: !!item.tipText, fontSize: '12px', color: '#E6A23C' } },
+ {style: {display: !!item.tipText, fontSize: '12px', color: '#E6A23C'}},
item.tipText
)
])
@@ -1127,11 +1142,11 @@ const showApiUrl = async (row) => {
})
message.alert('', '接口地址', {
message: () => {
- return h('div', { width: '360px' }, list)
+ return h('div', {width: '360px'}, list)
},
confirmButtonText: '关闭',
dangerouslyUseHTMLString: true,
- customStyle: { width: '384px' }
+ customStyle: {width: '384px'}
})
}
const copyDbTable = (row) => {
@@ -1146,7 +1161,7 @@ const copyDbTable = (row) => {
if (!RExp.test(value)) return '表名只能使用小写字母、数字、下划线,并以字母开头'
}
})
- .then(async ({ value }) => {
+ .then(async ({value}) => {
loading.value = true
const bool = await TableApi.verifyDbName(value)
if (bool) {
@@ -1169,7 +1184,7 @@ const unlockEnhance = (type, row) => {
const openWebEnhance = async (enhanceType) => {
loading.value = true
- jsEnhanceData.value = { jsJson: '' }
+ jsEnhanceData.value = {jsJson: ''}
const dbformId = tableSelect.value[0].id
const detailData = await JsApi.getJsDetail({
dbformId,
@@ -1217,7 +1232,7 @@ const openWebEnhance = async (enhanceType) => {
},
footerBtn: [
{
- params: { type: 'primary' },
+ params: {type: 'primary'},
name: '保 存',
icon: 'mingcute:save-line',
loading: true,
@@ -1228,7 +1243,7 @@ const openWebEnhance = async (enhanceType) => {
}
},
{
- params: { type: 'success' },
+ params: {type: 'success'},
name: '保存并关闭',
icon: 'mingcute:save-line',
loading: true,
@@ -1257,11 +1272,11 @@ const openWebEnhance = async (enhanceType) => {
}
if (enhanceType == 'js') {
params['providerType'] = 'tableJsEnhance'
- params['otherParams'] = { type: 'simple', width: '300px', tipKeyList: ['TableJsEnhance'] }
+ params['otherParams'] = {type: 'simple', width: '300px', tipKeyList: ['TableJsEnhance']}
params['language'] = 'javascript'
params['headerBtn'] = [
{
- params: { type: 'success' },
+ params: {type: 'success'},
name: '控件使用示例',
icon: 'jam:code-sample',
clickFun: async () => (samplePopup.value = true)
@@ -1279,7 +1294,7 @@ const openWebEnhance = async (enhanceType) => {
}
}
- openMEDialog({ params, prop: 'jsJson' }, jsEnhanceData.value)
+ openMEDialog({params, prop: 'jsJson'}, jsEnhanceData.value)
isUnload.value = true
}
const handleWebEnhance = (dbformId, enhanceType) => {
@@ -1301,16 +1316,16 @@ const handleWebEnhance = (dbformId, enhanceType) => {
})
}
-const cellStyle = ({ row, columnIndex }) => {
+const cellStyle = ({row, columnIndex}) => {
if (columnIndex == 6) {
- return { color: row.isDbSync == 'Y' ? '#67C23A' : '#F56C6C' }
+ return {color: row.isDbSync == 'Y' ? '#67C23A' : '#F56C6C'}
}
if (columnIndex == 5) {
let color = ''
if (row.tableClassify == 1) color = '#409EFF'
else if (row.tableClassify == 2) color = '#909399'
else if (row.tableClassify == 3) color = '#E6A23C'
- return { color }
+ return {color}
}
}
@@ -1327,7 +1342,7 @@ const radioClick = (row) => {
const setTreeLabelDicData = (dicData) => {
if (dicData.length == 0) {
- dicData = [{ label: '请先添加字段', value: 'low', disabled: true }]
+ dicData = [{label: '请先添加字段', value: 'low', disabled: true}]
}
customFormRef.value.updateDic('treeLabelField', dicData)
}
@@ -1354,7 +1369,7 @@ const openDataOrigin = () => {
})
const filedData = [...tableInfoRef.value.infoData.basics, ...tableInfoRef.value.tableInfoDefault]
dataOriginPopup.value.viewField = filedData.map((item) => {
- return { label: item.fieldName, value: item.fieldCode }
+ return {label: item.fieldName, value: item.fieldCode}
})
dataOriginPopup.value.show = true
}
@@ -1391,14 +1406,14 @@ const analysisDataOrigin = async () => {
return item
})
}
- let { infoData } = tableInfoOption.formattingInitData(analysisData)
+ let {infoData} = tableInfoOption.formattingInitData(analysisData)
infoData = infoData.map((item) => {
for (const key in item) {
if (item[key] === null || item[key] === undefined || key == 'fieldList_id') {
delete item[key]
}
}
- return { ...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item }
+ return {...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item}
})
setInfoBasics(infoData)
message.success('解析成功')
@@ -1422,11 +1437,11 @@ const getSqlFormConfig = async () => {
(item) => !tableInfoOption.disabledArr.includes(item.fieldCode) || item.fieldCode == 'pid'
)
fieldList = fieldList.map((item) => {
- return { ...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item }
+ return {...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item}
})
setInfoBasics(fieldList)
message.success('生成成功')
- let { tableName } = customFormOption.value.column
+ let {tableName} = customFormOption.value.column
tableName['disabled'] = true
})
.finally(() => (sqlFormLoading.value = false))
@@ -1457,7 +1472,7 @@ const handleAiCreatedTable = async () => {
(item) => !tableInfoOption.disabledArr.includes(item.fieldCode) || item.fieldCode == 'pid'
)
data.fieldModelList = data.fieldModelList.map((item) => {
- return { ...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item }
+ return {...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item}
})
aiCreatedObj.value.popup = false
crudRef.value.rowAdd()
@@ -1499,7 +1514,7 @@ const getTableData = async () => {
if (typeof item[key] == 'number') {
let val: number | string = item[key]
if (['jsCou', 'scssCou'].includes(key)) val = val > 0 ? '√' : val
- item.optionCondition.push({ label: couKey[key], value: val, key })
+ item.optionCondition.push({label: couKey[key], value: val, key})
}
}
return item
@@ -1524,7 +1539,8 @@ const searchChange = (params, done) => {
/** 清空按钮操作 */
const resetChange = () => {
- searchChange({}, () => {})
+ searchChange({}, () => {
+ })
}
const sizeChange = (pageSize) => {
@@ -1542,7 +1558,7 @@ const beforeOpen = async (done, type) => {
isTableInfo.value = false
const groupData = cloneDeep(treeData.value)
customFormOption.value.column.groupDbformId.dicData = groupData[0].children
- const { tableName, subTableListStr } = customFormOption.value.column
+ const {tableName, subTableListStr} = customFormOption.value.column
if (['edit', 'view'].includes(type) && tableForm.value.id) {
loading.value = true
const data = await TableApi.getDbDetail(tableForm.value.id, ['all'])
@@ -1550,7 +1566,7 @@ const beforeOpen = async (done, type) => {
data.dbForm.tableConfig = data.dbForm.tableConfig?.split(',') || []
data.dbForm.dataConfig = data.dbForm.dataConfig?.split(',') || []
editInfoData.value = data
- tableForm.value = { ...data.dbForm }
+ tableForm.value = {...data.dbForm}
tableName['disabled'] = true
tableName['rules'] = []
subTableListStr['display'] = tableForm.value.tableType == 3 && tableForm.value.subTableListStr
@@ -1585,7 +1601,7 @@ const beforeOpen = async (done, type) => {
searchStyle: 'default'
}
tableName['disabled'] = false
- tableName['rules'] = [{ validator: pageOption.tableName_required, trigger: 'blur' }] as any
+ tableName['rules'] = [{validator: pageOption.tableName_required, trigger: 'blur'}] as any
subTableListStr['display'] = false
if (groupValue.value) tableForm.value.groupDbformId = groupValue.value
authValue.value = ''
@@ -1648,8 +1664,8 @@ const rowSave = async (formData, done, loading) => {
const form = handleApiFormData(formData)
tableFormVerify('add')
.then(async (infoData: object) => {
- const elLoading = ElLoading.service({ fullscreen: true })
- let bool = await TableApi.saveDbData({ dbForm: { ...form }, ...infoData }).catch(() => false)
+ const elLoading = ElLoading.service({fullscreen: true})
+ let bool = await TableApi.saveDbData({dbForm: {...form}, ...infoData}).catch(() => false)
if (bool) {
message.success(t('common.createSuccess'))
resetChange()
@@ -1662,7 +1678,7 @@ const rowSave = async (formData, done, loading) => {
let key = Object.keys(error)[0]
message.info(error[key][0].message)
} else if (error !== 'message') {
- message.alert(error, '请修改', { dangerouslyUseHTMLString: true })
+ message.alert(error, '请修改', {dangerouslyUseHTMLString: true})
}
loading()
})
@@ -1680,7 +1696,7 @@ const rowUpdate = async (formData, index?, done?, loading?) => {
const form = handleApiFormData(formData)
tableFormVerify('edit')
.then(async (infoData: object) => {
- let bool = await TableApi.updateDbData({ dbForm: { ...form }, ...infoData }).catch(
+ let bool = await TableApi.updateDbData({dbForm: {...form}, ...infoData}).catch(
() => false
)
if (bool) {
@@ -1702,7 +1718,7 @@ const rowUpdate = async (formData, index?, done?, loading?) => {
let key = Object.keys(error)[0]
message.info(error[key][0].message)
} else if (error !== 'message') {
- message.alert(error, '请修改', { dangerouslyUseHTMLString: true })
+ message.alert(error, '请修改', {dangerouslyUseHTMLString: true})
}
loading()
})
@@ -1738,13 +1754,35 @@ const rowDel = async (form) => {
message.success(t('common.delSuccess'))
// 刷新列表
await getTableData()
- } catch {}
+ } catch {
+ }
}
const beforeUnload = (event) => {
if (isUnload.value) return (event.returnValue = '您确定要关闭页面吗?')
}
+/** 批量同步 **/
+const handleBatchSync = async () => {
+ // 首先需要查询有没有需要同步的表单,如果没有则提示消息并结束,如果有则打开弹窗
+ let searchObj = {
+ isDbSync: 'N',
+ pageNo: tablePage.value.currentPage,
+ pageSize: -1
+ }
+ const data = await TableApi.getDbList(searchObj)
+ if (data?.records?.length > 0) {
+ // 将data.records取出来,每个记录的id作为row.id,并且发起普通同步
+ const promises = data.records.map((row) => TableApi.asyncDbData(row.id, 'default'))
+ await Promise.all(promises).catch(() => message.alert('同步失败'))
+ // 刷新列表
+ getTableData()
+ } else {
+ // 没有需要同步的表单,提示信息并结束方法
+ message.info('没有需要同步的表单')
+ }
+}
+
/** 初始化 **/
onMounted(async () => {
window.addEventListener('beforeunload', beforeUnload)