diff --git a/Dockerfile b/Dockerfile index 5039872ca468e07134ce2671381e2e5b1a777c38..097c9cee24094bf03a4c2d6297a9f5b70e836f44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.c.163.com/tonight/oracle_jdk_1.8_131:131 +FROM registry.cn-heyuan.aliyuncs.com/somta/base-image:openjdk-1.8-v1 MAINTAINER Gavin somta@qq.com diff --git a/README.md b/README.md index 542ead76c43d9896e18f322feaa9d44e59773cbc..94f70f6dae5e154ae25fcd64c7cda2a8e95fdf53 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Juggle是一个接口编排的低代码工具,通过它可以快速将简单 2.支持字符串,布尔,整数,小数,日期,时间,列表,对象等数据结构,满足绝大数数据定义场景 -3.内置方法节点,判断节点,代码节点,赋值节点,MySql节点等多种节点,能灵活设计流程 +3.内置方法节点,判断节点,代码节点,赋值节点,MySql节点,并行节点,缓存节点等多种节点,能灵活设计流程 4.支持Groovy,JavaScript,Python,Java等多种脚本语言来增强流程 @@ -35,7 +35,7 @@ Juggle是一个接口编排的低代码工具,通过它可以快速将简单 6.套件市场拥有几十个常见系统的官方套件(如:通义千问,钉钉机器人,QQ邮箱,阿里云短信)等,开箱即用,大大降低流程设计的复杂度 -7.全信创支持,支持MySql,达梦,TiDB,OceanBase等数据库 +7.全信创支持,支持MySql,达梦,TiDB,OceanBase,Doris等近十款数据库 ## 流程说明 diff --git a/console-ui/package.json b/console-ui/package.json index cf97b887ebbd5c73365464991cd7244909e483ab..97de6ee825326926a23725aeb811e39c6eb8da2d 100644 --- a/console-ui/package.json +++ b/console-ui/package.json @@ -1,6 +1,6 @@ { "name": "juggle", - "version": "1.3.2", + "version": "1.4.0", "private": true, "scripts": { "dev": "node scripts/predev.js && vite", diff --git a/console-ui/public/suite/lanyun.png b/console-ui/public/suite/lanyun.png new file mode 100644 index 0000000000000000000000000000000000000000..d6eac79792587f21e069b512d390280b7f2aab4b Binary files /dev/null and b/console-ui/public/suite/lanyun.png differ diff --git a/console-ui/public/suite/tmt.svg b/console-ui/public/suite/tmt.svg new file mode 100644 index 0000000000000000000000000000000000000000..6a680a5af0a681beefc37597c91fe1af98901b76 --- /dev/null +++ b/console-ui/public/suite/tmt.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/console-ui/src/assets/base.css b/console-ui/src/assets/base.css index 71fe690f2ada74d2b8f645252ad1cda376f73e1f..62578ff1fda6916900aaa06ce12803c4d76c15e4 100644 --- a/console-ui/src/assets/base.css +++ b/console-ui/src/assets/base.css @@ -15,6 +15,14 @@ body { height: 100%; } +.search-bar{ + padding: 20px 0 0 20px; + margin-bottom: 12px; + background-color: var(--el-bg-color-overlay); + border-radius: 4px; + box-shadow: var(--el-box-shadow-light); +} + .page-header { height: auto !important; padding: 24px 20px 0 20px !important; @@ -25,8 +33,16 @@ body { overflow: auto; } +.table-container { + background-color: var(--el-bg-color-overlay); + border-radius: 4px; +} + .table-header{ background-color: #f0f0f0 !important; + .cell{ + font-weight: 600; + } } .table-pagination { padding: 12px 0; diff --git a/console-ui/src/components/filter/FilterValue.vue b/console-ui/src/components/filter/FilterValue.vue index 73fb9dc74c09af4e84f17d090d10e7d8e3c98cc8..4b7654050898447716b945d12f8f4b3de350b39b 100644 --- a/console-ui/src/components/filter/FilterValue.vue +++ b/console-ui/src/components/filter/FilterValue.vue @@ -33,6 +33,15 @@ const innerValue = computed({ }, }); +const switchValue = computed({ + get() { + return innerValue.value === true + }, + set(newValue) { + innerValue.value = newValue + } +}) + const currentType = computed(() => { return props.dataType?.type; }); @@ -45,7 +54,7 @@ const currentType = computed(() => { v-model="innerValue" :controls="showNumberControls" controls-position="right" - :max="100000000" + :max="9999999999999" :precision="0" :size="size" placeholder="请输入" @@ -55,6 +64,7 @@ const currentType = computed(() => { v-model="innerValue" :controls="showNumberControls" controls-position="right" + :max="9999999999999" :precision="2" :size="size" placeholder="请输入" @@ -73,7 +83,7 @@ const currentType = computed(() => { value-format="YYYY-MM-DD HH:mm:ss"/> { :size="size" style="width: 100%" @change="handleChange" + :filterable="true" /> diff --git a/console-ui/src/components/layout/aside/LayoutAside.vue b/console-ui/src/components/layout/aside/LayoutAside.vue index 639a7577501d22b329bc511114f8d38a106614f4..30156b2d95708a28461191d5b9cfe062294d2f06 100644 --- a/console-ui/src/components/layout/aside/LayoutAside.vue +++ b/console-ui/src/components/layout/aside/LayoutAside.vue @@ -7,7 +7,7 @@ import IconSetting from "@/components/icons/IconSetting.vue"; - - diff --git a/console-ui/src/views/flow/design/types.ts b/console-ui/src/views/flow/design/types.ts index a8ab14bed5b479ee79c229a51d2a8389b81987ac..17983e79bc1e129c068dc85e0aa5f596dea3b7f0 100644 --- a/console-ui/src/views/flow/design/types.ts +++ b/console-ui/src/views/flow/design/types.ts @@ -20,8 +20,8 @@ export type RawData = { }; export type MethodInfo = { - methodCode: string; - suiteCode: string; + methodCode: string | null; + suiteCode: string | null; requestContentType: string; requestType: string; url: string; diff --git a/console-ui/src/views/flow/version/FlowVersionTable.vue b/console-ui/src/views/flow/version/FlowVersionTable.vue index ff210636630a1e50232744cb1816deb9df6474d1..e6781286955120ab9b8bc2fbb9514271bd148cf7 100644 --- a/console-ui/src/views/flow/version/FlowVersionTable.vue +++ b/console-ui/src/views/flow/version/FlowVersionTable.vue @@ -48,8 +48,8 @@ function buildFullTriggerUrl(triggerUrl: string) { {{ buildFullTriggerUrl(scope.row.triggerUrl) }} - - + +