Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datax-cloud
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄营
datax-cloud
Commits
68449eaa
Commit
68449eaa
authored
Sep 01, 2020
by
yuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目初始化
parent
ec4dd780
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
362 additions
and
10 deletions
+362
-10
ModelColumnDto.java
...datax/service/data/masterdata/api/dto/ModelColumnDto.java
+2
-0
ModelColumnEntity.java
...service/data/masterdata/api/entity/ModelColumnEntity.java
+22
-0
ModelCommentEntity.java
...ervice/data/masterdata/api/entity/ModelCommentEntity.java
+15
-0
ModelDataEntity.java
...x/service/data/masterdata/api/entity/ModelDataEntity.java
+15
-0
ModelEntity.java
...datax/service/data/masterdata/api/entity/ModelEntity.java
+1
-1
OracleDataTypeEnum.java
...service/data/masterdata/api/enums/OracleDataTypeEnum.java
+33
-0
ColumnParser.java
...atax/service/data/masterdata/api/parser/ColumnParser.java
+9
-0
DataType.java
...cn/datax/service/data/masterdata/api/parser/DataType.java
+7
-0
OracleBlobDataType.java
...data/masterdata/api/parser/oracle/OracleBlobDataType.java
+11
-0
OracleCharDataType.java
...data/masterdata/api/parser/oracle/OracleCharDataType.java
+13
-0
OracleClobDataType.java
...data/masterdata/api/parser/oracle/OracleClobDataType.java
+11
-0
OracleColumnParser.java
...data/masterdata/api/parser/oracle/OracleColumnParser.java
+26
-0
OracleDateDataType.java
...data/masterdata/api/parser/oracle/OracleDateDataType.java
+11
-0
OracleNumberDataType.java
...ta/masterdata/api/parser/oracle/OracleNumberDataType.java
+13
-0
ModelColumnVo.java
...n/datax/service/data/masterdata/api/vo/ModelColumnVo.java
+1
-0
OracleDynamicDao.java
...n/datax/service/data/masterdata/dao/OracleDynamicDao.java
+25
-0
ModelColumnMapper.xml
...a-service/src/main/resources/mapper/ModelColumnMapper.xml
+2
-1
OracleDynamicMapper.xml
...service/src/main/resources/mapper/OracleDynamicMapper.xml
+70
-0
DataModelAdd.vue
datax-ui/src/views/masterdata/datamodel/DataModelAdd.vue
+30
-4
DataModelDetail.vue
datax-ui/src/views/masterdata/datamodel/DataModelDetail.vue
+21
-1
DataModelEdit.vue
datax-ui/src/views/masterdata/datamodel/DataModelEdit.vue
+24
-3
No files found.
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/dto/ModelColumnDto.java
View file @
68449eaa
...
...
@@ -39,6 +39,8 @@ public class ModelColumnDto implements Serializable {
private
String
columnLength
;
@ApiModelProperty
(
value
=
"列小数位数"
)
private
String
columnScale
;
@ApiModelProperty
(
value
=
"列默认值"
)
private
String
defaultValue
;
@ApiModelProperty
(
value
=
"是否主键(0否,1是)"
)
private
String
isPk
;
@ApiModelProperty
(
value
=
"是否必填(0否,1是)"
)
...
...
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/entity/ModelColumnEntity.java
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
entity
;
import
cn.datax.service.data.masterdata.api.enums.OracleDataTypeEnum
;
import
cn.datax.service.data.masterdata.api.parser.ColumnParser
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
import
cn.datax.service.data.masterdata.api.parser.oracle.OracleColumnParser
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
cn.datax.common.base.BaseEntity
;
import
lombok.Data
;
...
...
@@ -53,6 +58,11 @@ public class ModelColumnEntity extends BaseEntity {
private
String
columnScale
;
/**
* 列默认值
*/
private
String
defaultValue
;
/**
* 是否主键(0否,1是)
*/
private
String
isPk
;
...
...
@@ -111,4 +121,16 @@ public class ModelColumnEntity extends BaseEntity {
* 排序
*/
private
Integer
sort
;
/**
* 列属性
*/
@TableField
(
exist
=
false
)
private
String
columnDefinition
;
public
String
getColumnDefinition
()
throws
Exception
{
ColumnParser
columnParser
=
new
OracleColumnParser
();
DataType
parse
=
columnParser
.
parse
(
OracleDataTypeEnum
.
match
(
this
.
columnType
,
OracleDataTypeEnum
.
CHAR
));
return
parse
.
fillTypeString
(
this
.
columnLength
,
this
.
columnScale
);
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/entity/ModelCommentEntity.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
entity
;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
public
class
ModelCommentEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
tableName
;
private
String
columnName
;
private
String
comment
;
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/entity/ModelDataEntity.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
entity
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Map
;
@Data
public
class
ModelDataEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
tableName
;
private
Map
<
String
,
Object
>
datas
;
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/entity/ModelEntity.java
View file @
68449eaa
...
...
@@ -20,7 +20,7 @@ import java.util.List;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"masterdata_model
"
)
@TableName
(
value
=
"masterdata_model"
,
resultMap
=
"BaseResultMap
"
)
public
class
ModelEntity
extends
DataScopeBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/enums/OracleDataTypeEnum.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
enums
;
public
enum
OracleDataTypeEnum
{
CHAR
(
"char"
,
"字符串"
),
NUMBER
(
"number"
,
"数值"
),
DATE
(
"date"
,
"日期"
),
CLOB
(
"clob"
,
"大文本"
),
BLOB
(
"blob"
,
"二进制"
);
private
String
value
;
private
String
title
;
OracleDataTypeEnum
(
String
value
,
String
title
)
{
this
.
value
=
value
;
this
.
title
=
title
;
}
public
String
getValue
()
{
return
value
;
}
public
String
getTitle
()
{
return
title
;
}
public
static
OracleDataTypeEnum
match
(
String
value
,
OracleDataTypeEnum
defaultItem
)
{
if
(
value
!=
null
)
{
for
(
OracleDataTypeEnum
item:
OracleDataTypeEnum
.
values
())
{
if
(
item
.
getValue
().
equals
(
value
))
{
return
item
;
}
}
}
return
defaultItem
;
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/ColumnParser.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
;
import
cn.datax.service.data.masterdata.api.enums.OracleDataTypeEnum
;
public
interface
ColumnParser
{
DataType
parse
(
OracleDataTypeEnum
dataTypeEnum
)
throws
Exception
;
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/DataType.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
;
public
interface
DataType
{
String
fillTypeString
(
String
columnLength
,
String
columnScale
);
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/oracle/OracleBlobDataType.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
.
oracle
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
public
class
OracleBlobDataType
implements
DataType
{
@Override
public
String
fillTypeString
(
String
columnLength
,
String
columnScale
)
{
return
"BLOB"
;
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/oracle/OracleCharDataType.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
.
oracle
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
import
java.util.Optional
;
public
class
OracleCharDataType
implements
DataType
{
@Override
public
String
fillTypeString
(
String
columnLength
,
String
columnScale
)
{
return
"VARCHAR2("
+
Optional
.
ofNullable
(
columnLength
).
orElse
(
"255"
)
+
")"
;
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/oracle/OracleClobDataType.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
.
oracle
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
public
class
OracleClobDataType
implements
DataType
{
@Override
public
String
fillTypeString
(
String
columnLength
,
String
columnScale
)
{
return
"CLOB"
;
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/oracle/OracleColumnParser.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
.
oracle
;
import
cn.datax.common.exception.DataException
;
import
cn.datax.service.data.masterdata.api.enums.OracleDataTypeEnum
;
import
cn.datax.service.data.masterdata.api.parser.ColumnParser
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
public
class
OracleColumnParser
implements
ColumnParser
{
@Override
public
DataType
parse
(
OracleDataTypeEnum
dataTypeEnum
)
throws
Exception
{
switch
(
dataTypeEnum
)
{
case
CHAR:
return
new
OracleCharDataType
();
case
DATE:
return
new
OracleDateDataType
();
case
NUMBER:
return
new
OracleNumberDataType
();
case
CLOB:
return
new
OracleClobDataType
();
case
BLOB:
return
new
OracleBlobDataType
();
}
throw
new
DataException
(
"字段数据类型错误"
);
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/oracle/OracleDateDataType.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
.
oracle
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
public
class
OracleDateDataType
implements
DataType
{
@Override
public
String
fillTypeString
(
String
columnLength
,
String
columnScale
)
{
return
"DATE"
;
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/parser/oracle/OracleNumberDataType.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
api
.
parser
.
oracle
;
import
cn.datax.service.data.masterdata.api.parser.DataType
;
import
java.util.Optional
;
public
class
OracleNumberDataType
implements
DataType
{
@Override
public
String
fillTypeString
(
String
columnLength
,
String
columnScale
)
{
return
"NUMBER("
+
Optional
.
ofNullable
(
columnLength
).
orElse
(
"22"
)
+
", "
+
Optional
.
ofNullable
(
columnScale
).
orElse
(
"0"
)
+
")"
;
}
}
datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/vo/ModelColumnVo.java
View file @
68449eaa
...
...
@@ -29,6 +29,7 @@ public class ModelColumnVo implements Serializable {
private
String
columnType
;
private
String
columnLength
;
private
String
columnScale
;
private
String
defaultValue
;
private
String
isPk
;
private
String
isRequired
;
private
String
isInsert
;
...
...
datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/dao/OracleDynamicDao.java
0 → 100644
View file @
68449eaa
package
cn
.
datax
.
service
.
data
.
masterdata
.
dao
;
import
cn.datax.service.data.masterdata.api.entity.ModelCommentEntity
;
import
cn.datax.service.data.masterdata.api.entity.ModelDataEntity
;
import
cn.datax.service.data.masterdata.api.entity.ModelEntity
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
@Mapper
public
interface
OracleDynamicDao
{
void
createTable
(
ModelEntity
modelEntity
);
void
commentTable
(
ModelCommentEntity
modelCommentEntity
);
void
commentColumn
(
ModelCommentEntity
modelCommentEntity
);
void
dropTable
(
@Param
(
"tableName"
)
String
tableName
);
void
insertData
(
ModelDataEntity
modelDataEntity
);
void
updateData
(
ModelDataEntity
modelDataEntity
);
void
deleteData
(
ModelDataEntity
modelDataEntity
);
}
datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/mapper/ModelColumnMapper.xml
View file @
68449eaa
...
...
@@ -17,6 +17,7 @@
<result
column=
"column_type"
property=
"columnType"
/>
<result
column=
"column_length"
property=
"columnLength"
/>
<result
column=
"column_scale"
property=
"columnScale"
/>
<result
column=
"default_value"
property=
"defaultValue"
/>
<result
column=
"is_pk"
property=
"isPk"
/>
<result
column=
"is_required"
property=
"isRequired"
/>
<result
column=
"is_insert"
property=
"isInsert"
/>
...
...
@@ -40,7 +41,7 @@
update_by,
update_time,
remark,
model_id, column_name, column_comment, column_type, column_length, column_scale, is_pk, is_required, is_insert, is_edit, is_list, is_query, query_type, is_bind_dict, bind_dict_type_id, bind_dict_column, html_type, sort
model_id, column_name, column_comment, column_type, column_length, column_scale,
default_value,
is_pk, is_required, is_insert, is_edit, is_list, is_query, query_type, is_bind_dict, bind_dict_type_id, bind_dict_column, html_type, sort
</sql>
</mapper>
datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/mapper/OracleDynamicMapper.xml
0 → 100644
View file @
68449eaa
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.datax.service.data.masterdata.dao.OracleDynamicDao"
>
<insert
id=
"createTable"
parameterType=
"cn.datax.service.data.masterdata.api.entity.ModelEntity"
>
CREATE TABLE ${modelLogicTable} (
ID VARCHAR2(20) NOT NULL PRIMARY KEY,
STATUS NUMBER(1, 0) DEFAULT '1' NOT NULL,
CREATE_BY VARCHAR2(20),
CREATE_TIME DATE,
CREATE_DEPT VARCHAR2(20),
UPDATE_BY VARCHAR2(20),
UPDATE_TIME DATE,
REMARK VARCHAR2(2000),
<foreach
collection=
"modelColumns"
item=
"column"
separator=
","
>
${column.columnName} ${column.columnDefinition}
<if
test=
"column.defaultValue != null and column.defaultValue != ''"
>
DEFAULT #{column.defaultValue}
</if>
<if
test=
"column.isRequired != null and column.isRequired == '1'.toString()"
>
NOT NULL
</if>
<if
test=
"column.isPk != null and column.isPk == '1'.toString()"
>
PRIMARY KEY
</if>
</foreach>
)
</insert>
<!-- 表注释 -->
<update
id=
"commentTable"
parameterType=
"cn.datax.service.data.masterdata.api.entity.ModelCommentEntity"
>
COMMENT ON TABLE ${tableName} IS #{comment}
</update>
<!-- 字段注释 -->
<update
id=
"commentColumn"
parameterType=
"cn.datax.service.data.masterdata.api.entity.ModelCommentEntity"
>
COMMENT ON COLUMN ${tableName}.${columnName} IS #{comment}
</update>
<!-- 验证表是否存在 -->
<update
id=
"dropTable"
parameterType=
"java.lang.String"
>
DROP TABLE IF EXISTS ${tableName}
</update>
<!-- 插入数据 -->
<insert
id=
"insertData"
parameterType=
"cn.datax.service.data.masterdata.api.entity.ModelDataEntity"
>
INSERT INTO ${tableName}
<foreach
collection=
"datas.keys"
item=
"key"
open=
"("
close=
")"
separator=
","
>
${key}
</foreach>
VALUES
<foreach
collection=
"datas.values"
item=
"value"
open=
"("
close=
")"
separator=
","
>
#{value}
</foreach>
</insert>
<!-- 更新数据 -->
<update
id=
"updateData"
parameterType=
"cn.datax.service.data.masterdata.api.entity.ModelDataEntity"
>
UPDATE ${tableName} SET
<foreach
collection=
"datas.keys"
index=
"key"
item=
"value"
separator=
","
>
${key} = #{value}
</foreach>
WHERE ID = #{datas[ID]}
</update>
<!-- 删除数据 -->
<delete
id=
"deleteData"
parameterType=
"cn.datax.service.data.masterdata.api.entity.ModelDataEntity"
>
DELETE FROM ${tableName} WHERE ID = #{datas[ID]}
</delete>
</mapper>
datax-ui/src/views/masterdata/datamodel/DataModelAdd.vue
View file @
68449eaa
...
...
@@ -31,7 +31,7 @@
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane
label=
"字段
信息
"
name=
"second"
>
<el-tab-pane
label=
"字段
属性
"
name=
"second"
>
<el-button
@
click=
"addRow"
>
添加
</el-button>
<el-form
ref=
"table"
:model=
"form"
:rules=
"rules"
size=
"mini"
>
<el-table
:data=
"form.modelColumns"
border
style=
"width: 100%; margin: 15px 0;"
>
...
...
@@ -53,7 +53,14 @@
<el-table-column
label=
"列类型"
>
<
template
slot-scope=
"scope"
>
<el-form-item
:prop=
"'modelColumns.' + scope.$index + '.columnType'"
:rules=
"rules.columnType"
>
<el-input
v-model=
"scope.row.columnType"
clearable
placeholder=
"请输入列类型"
/>
<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"
/>
</el-select>
</el-form-item>
</
template
>
</el-table-column>
...
...
@@ -71,6 +78,13 @@
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
label=
"默认值"
>
<
template
slot-scope=
"scope"
>
<el-form-item
:prop=
"'modelColumns.' + scope.$index + '.defaultValue'"
>
<el-input
v-model=
"scope.row.defaultValue"
clearable
placeholder=
"请输入默认值"
/>
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
label=
"主键"
align=
"center"
width=
"55"
>
<
template
slot-scope=
"scope"
>
<el-form-item
:prop=
"'modelColumns.' + scope.$index + '.isPk'"
>
...
...
@@ -153,6 +167,10 @@
</el-table>
</el-form>
</el-tab-pane>
<el-tab-pane
label=
"唯一约束"
name=
"fourth"
>
唯一约束
</el-tab-pane>
<el-tab-pane
label=
"条件约束"
name=
"fifth"
>
条件约束
</el-tab-pane>
<el-tab-pane
label=
"外键约束"
name=
"sixth"
>
外键约束
</el-tab-pane>
<el-tab-pane
label=
"索引"
name=
"seventh"
>
索引
</el-tab-pane>
</el-tabs>
</div>
</el-card>
...
...
@@ -208,7 +226,7 @@ export default {
{
required
:
true
,
message
:
'列描述不能为空'
,
trigger
:
'blur'
}
],
columnType
:
[
{
required
:
true
,
message
:
'列类型不能为空'
,
trigger
:
'
blur
'
}
{
required
:
true
,
message
:
'列类型不能为空'
,
trigger
:
'
change
'
}
],
htmlType
:
[
{
required
:
true
,
message
:
'显示类型不能为空'
,
trigger
:
'change'
}
...
...
@@ -217,6 +235,8 @@ export default {
// 状态数据字典
statusOptions
:
[],
activeName
:
'first'
,
// 列类型数据字典
columnTypeOptions
:
[],
// 查询方式数据字典
queryTypeOptions
:
[],
// 显示类型数据字典
...
...
@@ -229,6 +249,11 @@ export default {
this
.
statusOptions
=
response
.
data
}
})
this
.
getDicts
(
'data_type_oracle'
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
columnTypeOptions
=
response
.
data
}
})
this
.
getDicts
(
'data_query_type'
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
queryTypeOptions
=
response
.
data
...
...
@@ -248,9 +273,10 @@ export default {
const
item
=
{
columnName
:
''
,
columnComment
:
''
,
columnType
:
''
,
columnType
:
'
char
'
,
columnLength
:
'255'
,
columnScale
:
'0'
,
defaultValue
:
''
,
isPk
:
'0'
,
isRequired
:
'0'
,
isInsert
:
'0'
,
...
...
datax-ui/src/views/masterdata/datamodel/DataModelDetail.vue
View file @
68449eaa
...
...
@@ -51,7 +51,14 @@
<el-table-column
label=
"列类型"
>
<
template
slot-scope=
"scope"
>
<el-form-item>
<el-input
v-model=
"scope.row.columnType"
clearable
placeholder=
"请输入列类型"
/>
<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"
/>
</el-select>
</el-form-item>
</
template
>
</el-table-column>
...
...
@@ -69,6 +76,13 @@
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
label=
"默认值"
>
<
template
slot-scope=
"scope"
>
<el-form-item>
<el-input
v-model=
"scope.row.defaultValue"
clearable
placeholder=
"请输入默认值"
/>
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
label=
"主键"
align=
"center"
width=
"55"
>
<
template
slot-scope=
"scope"
>
<el-form-item>
...
...
@@ -176,6 +190,7 @@ export default {
// 状态数据字典
statusOptions
:
[],
activeName
:
'first'
,
columnTypeOptions
:
[],
queryTypeOptions
:
[],
htmlTypeOptions
:
[]
}
...
...
@@ -187,6 +202,11 @@ export default {
this
.
statusOptions
=
response
.
data
}
})
this
.
getDicts
(
'data_type_oracle'
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
columnTypeOptions
=
response
.
data
}
})
this
.
getDicts
(
'data_query_type'
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
queryTypeOptions
=
response
.
data
...
...
datax-ui/src/views/masterdata/datamodel/DataModelEdit.vue
View file @
68449eaa
...
...
@@ -53,7 +53,14 @@
<el-table-column
label=
"列类型"
>
<
template
slot-scope=
"scope"
>
<el-form-item
:prop=
"'modelColumns.' + scope.$index + '.columnType'"
:rules=
"rules.columnType"
>
<el-input
v-model=
"scope.row.columnType"
clearable
placeholder=
"请输入列类型"
/>
<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"
/>
</el-select>
</el-form-item>
</
template
>
</el-table-column>
...
...
@@ -71,6 +78,13 @@
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
label=
"默认值"
>
<
template
slot-scope=
"scope"
>
<el-form-item
:prop=
"'modelColumns.' + scope.$index + '.defaultValue'"
>
<el-input
v-model=
"scope.row.defaultValue"
clearable
placeholder=
"请输入默认值"
/>
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
label=
"主键"
align=
"center"
width=
"55"
>
<
template
slot-scope=
"scope"
>
<el-form-item
:prop=
"'modelColumns.' + scope.$index + '.isPk'"
>
...
...
@@ -205,7 +219,7 @@ export default {
{
required
:
true
,
message
:
'列描述不能为空'
,
trigger
:
'blur'
}
],
columnType
:
[
{
required
:
true
,
message
:
'列类型不能为空'
,
trigger
:
'
blur
'
}
{
required
:
true
,
message
:
'列类型不能为空'
,
trigger
:
'
change
'
}
],
htmlType
:
[
{
required
:
true
,
message
:
'显示类型不能为空'
,
trigger
:
'change'
}
...
...
@@ -214,6 +228,7 @@ export default {
// 状态数据字典
statusOptions
:
[],
activeName
:
'first'
,
columnTypeOptions
:
[],
queryTypeOptions
:
[],
htmlTypeOptions
:
[]
}
...
...
@@ -225,6 +240,11 @@ export default {
this
.
statusOptions
=
response
.
data
}
})
this
.
getDicts
(
'data_type_oracle'
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
columnTypeOptions
=
response
.
data
}
})
this
.
getDicts
(
'data_query_type'
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
queryTypeOptions
=
response
.
data
...
...
@@ -255,9 +275,10 @@ export default {
const
item
=
{
columnName
:
''
,
columnComment
:
''
,
columnType
:
''
,
columnType
:
'
char
'
,
columnLength
:
'255'
,
columnScale
:
'0'
,
defaultValue
:
''
,
isPk
:
'0'
,
isRequired
:
'0'
,
isInsert
:
'0'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment