Skip to content

D
datax-cloud
Commit 7fb3c79d by yuwei
Options

项目初始化

parent 717ec034
Showing with 79 additions and 143 deletions
datax-ui/src/views/masterdata/datamanage/DataList.vue
......@@ -13,7 +13,7 @@
@node-click="handleNodeClick"
>
<span slot-scope="{ node, data }" class="custom-tree-node">
<i v-if="node.level === 1" class="el-icon-folder tree-folder" />
<i v-if="node.level === 1" class="iconfont icon-zuzhi tree-folder" />
<span>{{ node.label }}</span>
</span>
</el-tree>
......@@ -67,46 +67,6 @@
>删除</el-button>
</el-button-group>
</el-col>
<el-col :span="12">
<div class="right-toolbar">
<el-tooltip content="密度" effect="dark" placement="top">
<el-dropdown trigger="click" @command="handleCommand">
<el-button circle size="mini">
<svg-icon class-name="size-icon" icon-class="colum-height" />
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="medium">正常</el-dropdown-item>
<el-dropdown-item command="small">中等</el-dropdown-item>
<el-dropdown-item command="mini">紧凑</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-tooltip>
<el-tooltip content="刷新" effect="dark" placement="top">
<el-button circle size="mini" @click="handleRefresh">
<svg-icon class-name="size-icon" icon-class="shuaxin" />
</el-button>
</el-tooltip>
<el-tooltip content="列设置" effect="dark" placement="top">
<el-popover placement="bottom" width="100" trigger="click">
<el-checkbox-group
v-model="checkedTableColumns"
@change="handleCheckedColsChange"
>
<el-checkbox
v-for="(item, index) in tableColumns"
:key="index"
:label="item.prop"
>{{ item.label }}</el-checkbox>
</el-checkbox-group>
<span slot="reference">
<el-button circle size="mini">
<svg-icon class-name="size-icon" icon-class="shezhi" />
</el-button>
</span>
</el-popover>
</el-tooltip>
</div>
</el-col>
</el-row>
<el-table
......@@ -114,7 +74,6 @@
:data="tableDataList"
border
tooltip-effect="dark"
:size="tableSize"
:height="tableHeight"
style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
......@@ -201,9 +160,6 @@ export default {
single: true,
// 非多个禁用
multiple: true,
// 默认选择中表格头
checkedTableColumns: [],
tableSize: 'medium',
// 总数据条数
total: 0,
// 查询参数
......@@ -232,9 +188,6 @@ export default {
created() {
this.getTree()
},
mounted() {
this.initCols()
},
methods: {
/** 查询树结构 */
getTree() {
......@@ -249,21 +202,6 @@ export default {
}
})
},
initCols() {
this.checkedTableColumns = this.tableColumns.map(col => col.prop)
},
handleCheckedColsChange(val) {
this.tableColumns.forEach(col => {
if (!this.checkedTableColumns.includes(col.prop)) {
col.show = false
} else {
col.show = true
}
})
},
handleCommand(command) {
this.tableSize = command
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
......@@ -280,10 +218,6 @@ export default {
}
this.handleQuery()
},
/** 刷新列表 */
handleRefresh() {
this.getList()
},
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
......@@ -324,7 +258,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delData({ tableName: this.tableName, datas: { id: row.id }}).then(response => {
delData({ id: row.id, tableName: this.tableName, datas: { id: row.id }}).then(response => {
if (response.success) {
this.$message.success('删除成功')
this.getList()
......@@ -356,26 +290,26 @@ export default {
},
/** 节点单击事件 */
handleNodeClick(data) {
getTableParam(data.id).then(response => {
if (response.success) {
const { data } = response
this.tableName = data.tableName
this.tableColumns = data.columnList
this.tableParamList = data.queryList
this.queryParams.tableName = data.tableName
this.queryParams.columns = data.columnList.map(column => column.prop)
this.queryParams.conditions = data.queryList
this.$nextTick(() => {
// 获取表格数据
console.log(this.queryParams)
this.getList()
})
}
})
if (data.id) {
getTableParam(data.id).then(response => {
if (response.success) {
const { data } = response
this.tableName = data.tableName
this.tableColumns = data.columnList
this.tableParamList = data.queryList
this.queryParams.tableName = data.tableName
this.queryParams.columns = data.columnList.map(column => column.prop)
this.queryParams.conditions = data.queryList
this.$nextTick(() => {
// 获取表格数据
this.getList()
})
}
})
}
},
/** 查询列表 */
getList() {
console.log(this.queryParams)
this.loading = true
pageData(this.queryParams).then(response => {
this.loading = false
......
datax-ui/src/views/masterdata/datamodel/DataModelAdd.vue
......@@ -56,32 +56,32 @@
<el-select :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnType" clearable placeholder="请选择">
<el-option
v-for="item in columnTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="长度" width="70">
<el-table-column label="默认值">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnLength'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnLength" style="width: 50px;" :controls="false" />
<el-form-item :prop="'modelColumns.' + scope.$index + '.defaultValue'">
<el-input :disabled="scope.row.isSystem === '1'" v-model="scope.row.defaultValue" clearable placeholder="请输入默认值" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="小数位" width="70">
<el-table-column label="长度" width="80">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnScale'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnScale" style="width: 50px;" :controls="false" />
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnLength'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnLength" style="width: 60px;" :controls="false" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="默认值">
<el-table-column label="小数位" width="70">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.defaultValue'">
<el-input :disabled="scope.row.isSystem === '1'" v-model="scope.row.defaultValue" clearable placeholder="请输入默认值" />
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnScale'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnScale" style="width: 50px;" :controls="false" />
</el-form-item>
</template>
</el-table-column>
......@@ -130,12 +130,12 @@
<el-table-column label="查询方式" width="120">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.queryType'">
<el-select :disabled="scope.row.isSystem === '1'" v-model="scope.row.queryType" clearable placeholder="请选择">
<el-select :disabled="scope.row.isSystem === '1' || scope.row.isQuery === '0'" v-model="scope.row.queryType" clearable placeholder="请选择">
<el-option
v-for="item in queryTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
......@@ -147,9 +147,9 @@
<el-select :disabled="scope.row.isSystem === '1'" v-model="scope.row.htmlType" clearable placeholder="请选择">
<el-option
v-for="item in htmlTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
......@@ -158,7 +158,7 @@
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-form-item>
<el-button :disabled="scope.row.isSystem === '1' || scope.$index <= 8" icon="el-icon-arrow-up" circle @click="upRow(scope.$index)" />
<el-button :disabled="scope.row.isSystem === '1' || scope.$index < 8" icon="el-icon-arrow-up" circle @click="upRow(scope.$index)" />
<el-button :disabled="scope.row.isSystem === '1' || scope.$index === (form.modelColumns.length - 1)" icon="el-icon-arrow-down" circle @click="downRow(scope.$index)" />
<el-button :disabled="scope.row.isSystem === '1'" icon="el-icon-delete" circle @click="delRow(scope.$index)" />
</el-form-item>
......@@ -238,7 +238,9 @@ export default {
// 列类型数据字典
columnTypeOptions: [],
// 查询方式数据字典
queryTypeOptions: [],
queryTypeOptions: [
{}
],
// 显示类型数据字典
htmlTypeOptions: [],
// 系统默认列
......
datax-ui/src/views/masterdata/datamodel/DataModelDetail.vue
......@@ -55,32 +55,32 @@
<el-select v-model="scope.row.columnType" clearable placeholder="请选择">
<el-option
v-for="item in columnTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="长度" width="70">
<el-table-column label="默认值">
<template slot-scope="scope">
<el-form-item>
<el-input-number v-model="scope.row.columnLength" style="width: 50px;" :controls="false" />
<el-input v-model="scope.row.defaultValue" clearable placeholder="请输入默认值" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="小数位" width="70">
<el-table-column label="长度" width="70">
<template slot-scope="scope">
<el-form-item>
<el-input-number v-model="scope.row.columnScale" style="width: 50px;" :controls="false" />
<el-input-number v-model="scope.row.columnLength" style="width: 50px;" :controls="false" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="默认值">
<el-table-column label="小数位" width="70">
<template slot-scope="scope">
<el-form-item>
<el-input v-model="scope.row.defaultValue" clearable placeholder="请输入默认值" />
<el-input-number v-model="scope.row.columnScale" style="width: 50px;" :controls="false" />
</el-form-item>
</template>
</el-table-column>
......@@ -132,9 +132,9 @@
<el-select v-model="scope.row.queryType" clearable placeholder="请选择">
<el-option
v-for="item in queryTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
......@@ -146,9 +146,9 @@
<el-select v-model="scope.row.htmlType" clearable placeholder="请选择">
<el-option
v-for="item in htmlTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
......
datax-ui/src/views/masterdata/datamodel/DataModelEdit.vue
......@@ -56,32 +56,32 @@
<el-select :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnType" clearable placeholder="请选择">
<el-option
v-for="item in columnTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="长度" width="70">
<el-table-column label="默认值">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnLength'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnLength" style="width: 50px;" :controls="false" />
<el-form-item :prop="'modelColumns.' + scope.$index + '.defaultValue'">
<el-input :disabled="scope.row.isSystem === '1'" v-model="scope.row.defaultValue" clearable placeholder="请输入默认值" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="小数位" width="70">
<el-table-column label="长度" width="80">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnScale'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnScale" style="width: 50px;" :controls="false" />
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnLength'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnLength" style="width: 60px;" :controls="false" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="默认值">
<el-table-column label="小数位" width="70">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.defaultValue'">
<el-input :disabled="scope.row.isSystem === '1'" v-model="scope.row.defaultValue" clearable placeholder="请输入默认值" />
<el-form-item :prop="'modelColumns.' + scope.$index + '.columnScale'">
<el-input-number :disabled="scope.row.isSystem === '1'" v-model="scope.row.columnScale" style="width: 50px;" :controls="false" />
</el-form-item>
</template>
</el-table-column>
......@@ -130,12 +130,12 @@
<el-table-column label="查询方式" width="120">
<template slot-scope="scope">
<el-form-item :prop="'modelColumns.' + scope.$index + '.queryType'">
<el-select :disabled="scope.row.isSystem === '1'" v-model="scope.row.queryType" clearable placeholder="请选择">
<el-select :disabled="scope.row.isSystem === '1' || scope.row.isQuery === '0'" v-model="scope.row.queryType" clearable placeholder="请选择">
<el-option
v-for="item in queryTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
......@@ -147,9 +147,9 @@
<el-select :disabled="scope.row.isSystem === '1'" v-model="scope.row.htmlType" clearable placeholder="请选择">
<el-option
v-for="item in htmlTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.itemValue"
:value="item.itemText"
/>
</el-select>
</el-form-item>
......@@ -158,7 +158,7 @@
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-form-item>
<el-button :disabled="scope.row.isSystem === '1' || scope.$index <= 8" icon="el-icon-arrow-up" circle @click="upRow(scope.$index)" />
<el-button :disabled="scope.row.isSystem === '1' || scope.$index < 8" icon="el-icon-arrow-up" circle @click="upRow(scope.$index)" />
<el-button :disabled="scope.row.isSystem === '1' || scope.$index === (form.modelColumns.length - 1)" icon="el-icon-arrow-down" circle @click="downRow(scope.$index)" />
<el-button :disabled="scope.row.isSystem === '1'" icon="el-icon-delete" circle @click="delRow(scope.$index)" />
</el-form-item>
......
datax-ui/src/views/metadata/datamap/index.vue
......@@ -28,7 +28,7 @@
</el-form-item>
</el-form>
<el-divider />
<div id="chart" :style="{width: '100%', height: '85%'}" />
<div id="chart" :style="{width: '100%', height: 'calc(100vh - 300px)'}" />
</div>
</el-card>
</div>
......
datax-ui/src/views/standard/datadict/DataDictList.vue
......@@ -16,7 +16,7 @@
>
<template slot-scope="{ node, data }">
<span class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span><i v-if="node.level === 1" class="iconfont icon--folder-empty3 tree-folder" />{{ node.label }}</span>
<span><i v-if="node.level === 1" class="iconfont icon-zuzhi tree-folder" />{{ node.label }}</span>
<span class="tree-bts">
<i v-show="!data.id && data.show" class="el-icon-circle-plus-outline bt-add" @click="() => handleAddType()" />
<i v-show="data.id && data.show" class="el-icon-edit-outline bt-edit" @click="() => handleEditType(data)" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment