You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by zh...@apache.org on 2022/08/03 09:22:31 UTC
[incubator-seatunnel] branch dev updated: [Feat][UI] Add log components. (#2354)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 2dbb56b50 [Feat][UI] Add log components. (#2354)
2dbb56b50 is described below
commit 2dbb56b505288b0e70e73a6c8e2a4467a86e4baf
Author: songjianet <17...@qq.com>
AuthorDate: Wed Aug 3 17:22:25 2022 +0800
[Feat][UI] Add log components. (#2354)
---
.../en_US/index.ts => components/log/index.tsx} | 39 +++++++++++++++-------
seatunnel-ui/src/locales/en_US/data-pipes.ts | 4 +--
seatunnel-ui/src/locales/en_US/index.ts | 4 ++-
.../src/locales/en_US/{index.ts => log.ts} | 15 ++-------
4 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/seatunnel-ui/src/locales/en_US/index.ts b/seatunnel-ui/src/components/log/index.tsx
similarity index 56%
copy from seatunnel-ui/src/locales/en_US/index.ts
copy to seatunnel-ui/src/components/log/index.tsx
index 34e0c821b..70b326968 100644
--- a/seatunnel-ui/src/locales/en_US/index.ts
+++ b/seatunnel-ui/src/components/log/index.tsx
@@ -15,16 +15,31 @@
* limitations under the License.
*/
-import login from '@/locales/en_US/login'
-import menu from '@/locales/en_US/menu'
-import modal from '@/locales/en_US/modal'
-import user_manage from '@/locales/en_US/user-manage'
-import data_pipes from '@/locales/en_US/data-pipes'
+import { defineComponent } from 'vue'
+import { NButton, NInput, NInputGroup, NLog, NSpace } from 'naive-ui'
+import { useI18n } from 'vue-i18n'
-export default {
- login,
- menu,
- modal,
- user_manage,
- data_pipes
-}
+const Log = defineComponent({
+ setup() {
+ const { t } = useI18n()
+
+ return { t }
+ },
+ render() {
+ return (
+ <NSpace vertical>
+ <NInputGroup>
+ <NInput placeholder={this.t('log.please_select_log')} />
+ <NButton ghost>{this.t('log.search')}</NButton>
+ </NInputGroup>
+ <NLog
+ rows={30}
+ log={'test'}
+ class={['py-5', 'px-3', 'bg-gray-50']}
+ />
+ </NSpace>
+ )
+ }
+})
+
+export default Log
\ No newline at end of file
diff --git a/seatunnel-ui/src/locales/en_US/data-pipes.ts b/seatunnel-ui/src/locales/en_US/data-pipes.ts
index 86adae682..076162b33 100644
--- a/seatunnel-ui/src/locales/en_US/data-pipes.ts
+++ b/seatunnel-ui/src/locales/en_US/data-pipes.ts
@@ -57,7 +57,5 @@ export default {
execute_time: 'Execute Time',
data_pipes_delete_tips:
'Whether to delete the data Pipe,It cannot be restored after being deleted.',
- data_pipes_publish_tips: 'Whether to Publish the data pipe.',
- please_select_log: 'Please select log',
- search: 'Search'
+ data_pipes_publish_tips: 'Whether to Publish the data pipe.'
}
diff --git a/seatunnel-ui/src/locales/en_US/index.ts b/seatunnel-ui/src/locales/en_US/index.ts
index 34e0c821b..fe551eaef 100644
--- a/seatunnel-ui/src/locales/en_US/index.ts
+++ b/seatunnel-ui/src/locales/en_US/index.ts
@@ -20,11 +20,13 @@ import menu from '@/locales/en_US/menu'
import modal from '@/locales/en_US/modal'
import user_manage from '@/locales/en_US/user-manage'
import data_pipes from '@/locales/en_US/data-pipes'
+import log from '@/locales/en_US/log'
export default {
login,
menu,
modal,
user_manage,
- data_pipes
+ data_pipes,
+ log
}
diff --git a/seatunnel-ui/src/locales/en_US/index.ts b/seatunnel-ui/src/locales/en_US/log.ts
similarity index 74%
copy from seatunnel-ui/src/locales/en_US/index.ts
copy to seatunnel-ui/src/locales/en_US/log.ts
index 34e0c821b..a319a0686 100644
--- a/seatunnel-ui/src/locales/en_US/index.ts
+++ b/seatunnel-ui/src/locales/en_US/log.ts
@@ -15,16 +15,7 @@
* limitations under the License.
*/
-import login from '@/locales/en_US/login'
-import menu from '@/locales/en_US/menu'
-import modal from '@/locales/en_US/modal'
-import user_manage from '@/locales/en_US/user-manage'
-import data_pipes from '@/locales/en_US/data-pipes'
-
export default {
- login,
- menu,
- modal,
- user_manage,
- data_pipes
-}
+ please_select_log: 'Please select log',
+ search: 'Search'
+}
\ No newline at end of file