This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 6e72c7daf fix:fix udf tree time error (#3877)
6e72c7daf is described below
commit 6e72c7daf2e432d2f8e62af8a6d6c7cea91bf6ba
Author: jacktao007 <[email protected]>
AuthorDate: Wed Nov 23 10:22:05 2022 +0800
fix:fix udf tree time error (#3877)
* fix:fix udf tree time format error
* fix:fix udf tree update_time error
* fix:add error code multi-language
* fix:Optimize Datasource Type Key Manage
---
linkis-dist/package/db/linkis_ddl.sql | 4 +-
.../server/dao/DatasourceTypeKeyMapper.java | 5 +-
.../server/dao/mapper/DatasourceTypeKeyMapper.xml | 6 +-
.../restful/DatasourceTypeKeyRestfulApi.java | 10 +-
.../server/service/DatasourceTypeKeyService.java | 3 +-
.../service/impl/DatasourceTypeKeyServiceImpl.java | 6 +-
linkis-web/src/apps/linkis/i18n/common/en.json | 5 +-
linkis-web/src/apps/linkis/i18n/common/zh.json | 5 +-
.../module/datasourceTypeKey/EditForm/index.vue | 30 ++----
.../apps/linkis/module/datasourceTypeKey/index.vue | 114 ++++++++++++---------
.../linkis/module/datasourceTypeKey/service.js | 7 +-
.../src/apps/linkis/module/udfTree/index.vue | 4 +-
12 files changed, 114 insertions(+), 85 deletions(-)
diff --git a/linkis-dist/package/db/linkis_ddl.sql
b/linkis-dist/package/db/linkis_ddl.sql
index 745927645..9e10d0040 100644
--- a/linkis-dist/package/db/linkis_ddl.sql
+++ b/linkis-dist/package/db/linkis_ddl.sql
@@ -172,8 +172,8 @@ CREATE TABLE `linkis_ps_udf_tree` (
`name` varchar(100) DEFAULT NULL COMMENT 'Category name of the function. It
would be displayed in the front-end',
`user_name` varchar(50) NOT NULL,
`description` varchar(255) DEFAULT NULL,
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
- `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
`category` varchar(50) DEFAULT NULL COMMENT 'Used to distinguish between udf
and function',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
index e443909d3..358c44af8 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
@@ -20,6 +20,8 @@ package org.apache.linkis.basedatamanager.server.dao;
import org.apache.linkis.basedatamanager.server.domain.DatasourceTypeEntity;
import org.apache.linkis.basedatamanager.server.domain.DatasourceTypeKeyEntity;
+import org.apache.ibatis.annotations.Param;
+
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -29,5 +31,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @createDate 2022-11-19 10:53:47 @Entity
generator.domain.LinkisPsDmDatasourceTypeKey
*/
public interface DatasourceTypeKeyMapper extends
BaseMapper<DatasourceTypeKeyEntity> {
- List<DatasourceTypeEntity> getListByPage(String searchName);
+ List<DatasourceTypeEntity> getListByPage(
+ @Param("searchName") String searchName, @Param("dataSourceTypeId")
Integer dataSourceTypeId);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
index 4ca9eff74..1d87ea12b 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
@@ -50,8 +50,12 @@
select
<include refid="Base_Column_List"></include>
<![CDATA[ from linkis_ps_dm_datasource_type_key ]]>
+ where 1 = 1
<if test="searchName != null and searchName!=''">
- <![CDATA[ where `name` like concat('%',#{searchName},'%') ]]>
+ <![CDATA[and `name` like concat('%',#{searchName},'%') ]]>
+ </if>
+ <if test="dataSourceTypeId != null and dataSourceTypeId!=''">
+ <![CDATA[and `data_source_type_id` = #{dataSourceTypeId} ]]>
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
index e9d80375d..6f02adf27 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
@@ -48,10 +48,16 @@ public class DatasourceTypeKeyRestfulApi {
@ApiOperation(value = "list", notes = "list Datasource Type Key", httpMethod
= "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
public Message list(
- HttpServletRequest request, String searchName, Integer currentPage,
Integer pageSize) {
+ HttpServletRequest request,
+ @RequestParam(value = "searchName", required = false) String searchName,
+ @RequestParam(value = "dataSourceTypeId", required = false) Integer
dataSourceTypeId,
+ Integer currentPage,
+ Integer pageSize) {
+
ModuleUserUtils.getOperationUser(
request, "Query list data of Datasource Type Key,search name:" +
searchName);
- PageInfo pageList = datasourceTypeKeyService.getListByPage(searchName,
currentPage, pageSize);
+ PageInfo pageList =
+ datasourceTypeKeyService.getListByPage(searchName, dataSourceTypeId,
currentPage, pageSize);
return Message.ok("").data("list", pageList);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
index bd203b636..4d3407e1e 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
@@ -27,5 +27,6 @@ import com.github.pagehelper.PageInfo;
* @createDate 2022-11-19 10:53:47
*/
public interface DatasourceTypeKeyService extends
IService<DatasourceTypeKeyEntity> {
- PageInfo getListByPage(String searchName, Integer currentPage, Integer
pageSize);
+ PageInfo getListByPage(
+ String searchName, Integer dataSourceTypeId, Integer currentPage,
Integer pageSize);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
index b0406c0f3..ba0327c36 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
@@ -41,9 +41,11 @@ public class DatasourceTypeKeyServiceImpl
implements DatasourceTypeKeyService {
@Override
- public PageInfo getListByPage(String searchName, Integer currentPage,
Integer pageSize) {
+ public PageInfo getListByPage(
+ String searchName, Integer dataSourceTypeId, Integer currentPage,
Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
- List<DatasourceTypeEntity> listByPage =
this.getBaseMapper().getListByPage(searchName);
+ List<DatasourceTypeEntity> listByPage =
+ this.getBaseMapper().getListByPage(searchName, dataSourceTypeId);
PageInfo pageInfo = new PageInfo(listByPage);
return pageInfo;
}
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index be937af74..c7a374c47 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -491,7 +491,10 @@
"description": "Description",
"createTime": "Create Time",
"updateTime": "Update Time",
- "searchPlaceholder": "Name"
+ "searchPlaceholder": "Name",
+ "searchName": "名称",
+ "searchType": "类型",
+ "all": "All"
}
},
"EnginePluginManagement": {
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index a2f96970d..68d71baad 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -492,7 +492,10 @@
"description": "描述",
"createTime": "创建时间",
"updateTime": "更新时间",
- "searchPlaceholder": "名称"
+ "searchPlaceholder": "名称",
+ "searchName": "名称",
+ "searchType": "类型",
+ "all": "全部"
}
},
"EnginePluginManagement": {
diff --git
a/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
b/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
index 619df54bd..f6d2073d2 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
@@ -21,7 +21,6 @@
:rule="rule"
v-model="formModel"
:option="options"
- :value.sync="formData"
/>
</div>
</template>
@@ -30,12 +29,10 @@
export default {
props: {
mode: String,
- data: Object,
},
data() {
return {
formModel: {},
- formData: {},
options: {
submitBtn: false,
},
@@ -77,16 +74,18 @@ export default {
],
},
{
- type: 'input',
+ type: 'select',
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.dataSourceType'),
field: 'dataSourceTypeId',
+ options: [],
value: '',
props: {
- placeholder: "",
+ placeholder: "请选择",
},
validate: [
{
required: true,
+ type: "number",
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)}
`+this.$t('message.linkis.basedataManagement.datasourceTypeKey.dataSourceType'),
@@ -113,12 +112,13 @@ export default {
],
},
{
- type: 'input',
+ type: 'select',
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.valueType'),
field: 'valueType',
+ options: [{label: "TEXT",value: "TEXT"},{label: "PASSWORD",value:
"PASSWORD"},{label: "SELECT",value: "SELECT"}],
value: '',
props: {
- placeholder: "",
+ placeholder: "请选择",
},
validate: [
{
@@ -151,21 +151,5 @@ export default {
]
}
},
- created() {
- this.getData(this.data)
- },
- methods: {
- getData(data){
- this.formData = {...data}
- }
- },
- watch: {
- data: {
- handler(newV) {
- this.getData(newV)
- },
- deep: true,
- },
- },
}
</script>
diff --git a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
index 6bed681cf..e18e24b5f 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
@@ -17,24 +17,27 @@
<template>
<div :style="{height: '100%', overflow: 'hidden'}">
- <Row class="search-bar" type="flex">
- <Col span="6">
- <span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.datasourceTypeKey.searchPlaceholder')"></Input>
- </Col>
- <Col span="3">
- <Button type="primary" class="Button" @click="load()">{{
- $t('message.linkis.basedataManagement.search')
- }}
- </Button>
- <Button type="success" class="Button" style="margin-left: 10px"
@click="onAdd()">{{
- $t('message.linkis.basedataManagement.add')
- }}
- </Button>
- </Col>
- <Col span="15">
- </Col>
- </Row>
+ <div class="search-bar" style="display: flex;align-items: flex-start">
+
+ <span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.datasourceTypeKey.searchName')">{{$t('message.linkis.basedataManagement.datasourceTypeKey.searchName')}}</span>
+ <Input style="width: 150px" v-model="searchName" clearable class="input"
:placeholder="$t('message.linkis.basedataManagement.datasourceTypeKey.searchPlaceholder')"></Input>
+
+ <span :style="{ whiteSpace: 'nowrap',marginLeft:'5px', marginRight:
'5px', fontSize: '14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.datasourceTypeKey.searchType')">{{$t('message.linkis.basedataManagement.datasourceTypeKey.searchType')}}</span>
+ <Select style="width: 150px;margin-right: 15px" v-model="datasourceType"
>
+ <Option value="-1"
selected>{{$t('message.linkis.basedataManagement.datasourceTypeKey.all')}}</Option>
+ <Option v-for="item in datasourceTypeOptions" :value="item.value"
:key="item.value">{{item.label}}</Option>
+ </Select>
+
+ <Button type="primary" class="Button" @click="load()">{{
+ $t('message.linkis.basedataManagement.search')
+ }}
+ </Button>
+ <Button type="success" class="Button" style="margin-left: 10px"
@click="onAdd()">{{
+ $t('message.linkis.basedataManagement.add')
+ }}
+ </Button>
+
+ </div>
<Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist"
class="table-content mytable">
<template slot-scope="{ row,index }" slot="action">
@@ -83,7 +86,7 @@
<Button type="text" size="large"
@click="onModalCancel()">{{$t('message.linkis.basedataManagement.modal.cancel')}}</Button>
<Button type="primary" size="large"
@click="onModalOk('userConfirm')">{{$t('message.linkis.basedataManagement.modal.confirm')}}</Button>
</div>
- <EditForm ref="editForm" :data="modalEditData"></EditForm>
+ <EditForm ref="editForm"></EditForm>
</Modal>
</div>
</template>
@@ -92,12 +95,14 @@ import mixin from '@/common/service/mixin';
import EditForm from './EditForm/index'
import {add, del, edit, getList} from "./service";
import {formatDate} from "iview/src/components/date-picker/util";
+import {getAllEnv} from "../datasourceEnv/service";
export default {
mixins: [mixin],
components: {EditForm},
data() {
return {
searchName: "",
+ datasourceType: "-1",
page: {
totalSize: 0,
pageSize: 10,
@@ -111,6 +116,18 @@ export default {
tooltip: true,
align: 'center',
},
+ {
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.dataSourceType'),
+ key: 'dataSourceTypeId',
+ minWidth: 50,
+ tooltip: true,
+ align: 'center',
+ render: (h,params)=>{
+ return h('div',
+ this.getDatasourceType( params.row.dataSourceTypeId)
+ )
+ }
+ },
{
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.key'),
key: 'key',
@@ -146,7 +163,7 @@ export default {
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm:ss')
)
}
},
@@ -158,7 +175,7 @@ export default {
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm:ss')
)
}
},
@@ -170,52 +187,58 @@ export default {
},
],
- modalEditData: {
- key: '',
- name: '',
- valueType: '',
- id: '',
- description: '',
- },
pageDatalist: [],
modalShow: false,
modalAddMode: 'add',
- modalLoading: false
+ modalLoading: false,
+ datasourceTypeOptions: []
};
},
created() {
this.load()
},
- mounted() {
- this.init();
- },
methods: {
- init() {
- //console.log(this.$route.query.isSkip);
- },
- load() {
+ async load() {
let params = {
searchName: this.searchName,
+ dataSourceTypeId: this.datasourceType==="-1"?"":this.datasourceType,
currentPage: this.page.pageNow,
pageSize: this.page.pageSize
}
- getList(params).then((data) => {
- this.pageDatalist = data.list.list
- this.page.totalSize = data.list.total
- })
+
+ //拉取分类
+ let res = await getAllEnv()
+ let options = [...res.typeList].sort((a, b) => a.id - b.id)
+ .map(item => { return {value: +item.id, label: item.name}})
+ this.datasourceTypeOptions= options
+
+ //拉取列表
+ let data = await getList(params)
+ this.pageDatalist = data.list.list
+ this.page.totalSize = data.list.total
+ },
+ getDatasourceType(id){
+ if(this.datasourceTypeOptions.length>1){
+ let datasourceType = this.datasourceTypeOptions.filter(m=>m.value ===
id)
+ if(datasourceType.length>0){
+ return datasourceType[0].label
+ }
+ }
+ return "loadding"
},
changePage(value) {
this.page.pageNow = value
this.load()
},
onAdd(){
+ this.$refs.editForm.rule[2].options=this.datasourceTypeOptions
+ this.$refs.editForm.formModel.resetFields()
this.modalAddMode = 'add'
this.modalShow = true
- this.clearForm()
},
onTableEdit(row){
- row.dataSourceTypeId = row.dataSourceTypeId+""
- this.modalEditData = {...row}
+ this.$refs.editForm.rule[2].options=this.datasourceTypeOptions
+ this.$refs.editForm.formModel.setValue(row)
this.modalAddMode = 'edit'
this.modalShow = true
},
@@ -291,11 +314,6 @@ export default {
this.modalLoading=false
this.modalShow = false
},
- clearForm(){
- for(let key in this.modalEditData) {
- this.modalEditData[key] = ''
- }
- }
},
};
</script>
diff --git a/linkis-web/src/apps/linkis/module/datasourceTypeKey/service.js
b/linkis-web/src/apps/linkis/module/datasourceTypeKey/service.js
index f8191be9a..e1c2b3648 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/service.js
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/service.js
@@ -35,9 +35,14 @@ const del = (params)=> {
return api.fetch(`${dataSourceTypeBaseUrl}/${params.id}`,'delete')
}
+const getAllEnv = () => {
+ return api.fetch(`/data-source-manager/type/all`, 'get')
+}
+
export{
getList,
add,
edit,
- del
+ del,
+ getAllEnv
}
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index 04cd43005..cfe46d107 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -151,7 +151,7 @@ export default {
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm:ss')
)
}
},
@@ -163,7 +163,7 @@ export default {
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.updateTime),'yyyy-MM-dd hh:mm:ss')
)
}
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
