[release] release 1.6.1 rc2 and fix crlf encoding (#2724)

Signed-off-by: Logic <zqr10159@dromara.org>
Co-authored-by: aias00 <rokkki@163.com>
This commit is contained in:
Logic 2024-09-22 00:02:28 +08:00 committed by GitHub
parent b9fdfbd50e
commit a8790c856b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 12676 additions and 12676 deletions

View File

@ -1,38 +1,38 @@
{
"name": "Hertzbeat DevContainer",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "17",
"installMaven": "true",
"installGradle": "false"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "20"
},
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {}
},
"customizations": {
"vscode": {
"settings": {},
// same extensions as Gitpod, should match /.gitpod.yml
"extensions": [
"vscjava.vscode-java-pack",
"editorconfig.editorconfig",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint",
"DavidAnson.vscode-markdownlint",
"ms-azuretools.vscode-docker",
"cweijan.vscode-database-client2",
"GitHub.vscode-pull-request-github"
]
}
},
"portsAttributes": {
"4200": {
"label": "Hertzbeat Web",
"onAutoForward": "notify"
}
},
"postCreateCommand": "java -version"
}
{
"name": "Hertzbeat DevContainer",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "17",
"installMaven": "true",
"installGradle": "false"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "20"
},
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {}
},
"customizations": {
"vscode": {
"settings": {},
// same extensions as Gitpod, should match /.gitpod.yml
"extensions": [
"vscjava.vscode-java-pack",
"editorconfig.editorconfig",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint",
"DavidAnson.vscode-markdownlint",
"ms-azuretools.vscode-docker",
"cweijan.vscode-database-client2",
"GitHub.vscode-pull-request-github"
]
}
},
"portsAttributes": {
"4200": {
"label": "Hertzbeat Web",
"onAutoForward": "notify"
}
},
"postCreateCommand": "java -version"
}

View File

@ -1,53 +1,53 @@
tasks:
- name: Run backend
before: cd manager
command: |
gp sync-await setup-backend
mvn spring-boot:run
- name: Run frontend
before: cd web-app
command: |
gp sync-await setup-frontend
yarn start --public-host "`gp url 4200`"
openMode: split-right
- name: Setup backend
init: |
sdk install java 17.0.11.fx-zulu < /dev/null
sdk default java 17.0.11.fx-zulu < /dev/null
mvn clean install -DskipTests
command: |
gp sync-done setup-backend
exit 0
- name: Setup frontend
init: |
cd web-app && yarn install
command: |
gp sync-done setup-frontend
exit 0
openMode: split-right
vscode:
extensions:
- vscjava.vscode-java-pack
- editorconfig.editorconfig
- dbaeumer.vscode-eslint
- stylelint.vscode-stylelint
- DavidAnson.vscode-markdownlint
- ms-azuretools.vscode-docker
- cweijan.vscode-database-client2
- GitHub.vscode-pull-request-github
ports:
- port: 4200
name: Hertzbeat
onOpen: open-browser
- port: 1157
onOpen: ignore
- port: 1158
onOpen: ignore
tasks:
- name: Run backend
before: cd manager
command: |
gp sync-await setup-backend
mvn spring-boot:run
- name: Run frontend
before: cd web-app
command: |
gp sync-await setup-frontend
yarn start --public-host "`gp url 4200`"
openMode: split-right
- name: Setup backend
init: |
sdk install java 17.0.11.fx-zulu < /dev/null
sdk default java 17.0.11.fx-zulu < /dev/null
mvn clean install -DskipTests
command: |
gp sync-done setup-backend
exit 0
- name: Setup frontend
init: |
cd web-app && yarn install
command: |
gp sync-done setup-frontend
exit 0
openMode: split-right
vscode:
extensions:
- vscjava.vscode-java-pack
- editorconfig.editorconfig
- dbaeumer.vscode-eslint
- stylelint.vscode-stylelint
- DavidAnson.vscode-markdownlint
- ms-azuretools.vscode-docker
- cweijan.vscode-database-client2
- GitHub.vscode-pull-request-github
ports:
- port: 4200
name: Hertzbeat
onOpen: open-browser
- port: 1157
onOpen: ignore
- port: 1158
onOpen: ignore

View File

@ -1,320 +1,320 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# The monitoring type category:service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
category: db
# The monitoring type eg: linux windows tomcat mysql aws...
app: tidb
# The monitoring i18n name
name:
zh-CN: TiDB数据库
en-US: TiDB
# The description and help of this monitoring type
help:
zh-CN: HertzBeat 使用 HTTP 和 JDBC 协议对 TiDB 的通用性能指标进行采集监控,点击查看开启步骤</a>。<br>您可以点击“<i>新建 TiDB 数据库</i>”并进行配置,或者选择“<i>更多操作</i>”,导入已有配置。
en-US: HertzBeat monitors general performance metrics of TiDB through HTTP and JDBC protocol. <br> You could click the "<i>New TiDB</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>".
zh-TW: HertzBeat 使用 HTTP 和 JDBC 協議對 TiDB 的通用性能指標進行採集監控,點擊查看開啟步驟</a>。 <br>您可以點擊“<i>新建 TiDB 數據庫</i>”並進行配置,或者選擇“<i>更多操作</i>”,導入已有配置。
helpLink:
zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/tidb
en-US: https://hertzbeat.apache.org/docs/help/tidb
# Input params define for monitoring(render web ui by the definition)
params:
# field-param field key
- field: host
# name-param field display i18n name
name:
zh-CN: 目标Host
en-US: Target Host
# type-param field type(most mapping the html input type)
type: host
# required-true or false
required: true
# field-param field key
- field: port
# name-param field display i18n name
name:
zh-CN: JDBC 端口
en-US: JDBC Port
# type-param field type(most mapping the html input type)
type: number
# when type is number, range is required
range: '[0,65535]'
# required-true or false
required: false
defaultValue: 4000
# hide param-true or false
hide: true
- field: service-port
name:
zh-CN: Service 端口
en-US: Service Port
type: number
range: '[0,65535]'
required: true
defaultValue: 10080
- field: pd-port
name:
zh-CN: PD 端口
en-US: PD Port
type: number
range: '[0,65535]'
required: false
defaultValue: 2379
- field: timeout
name:
zh-CN: 查询超时时间(ms)
en-US: Query Timeout(ms)
type: number
required: false
defaultValue: 6000
- field: database
name:
zh-CN: 数据库名称
en-US: Database Name
type: text
required: false
hide: true
- field: username
name:
zh-CN: 用户名
en-US: Username
type: text
limit: 50
required: false
hide: true
- field: password
name:
zh-CN: 密码
en-US: Password
type: password
required: false
hide: true
- field: url
name:
zh-CN: JDBC URL
en-US: JDBC URL
type: text
required: false
hide: true
# collect metrics config list
metrics:
# metrics - status
- name: status
i18n:
zh-CN: 状态
en-US: Status
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
priority: 0
# collect metrics content
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
- field: connections
type: 0
i18n:
zh-CN: 连接数
en-US: Connections
- field: version
type: 1
i18n:
zh-CN: 版本
en-US: Version
- field: git_hash
type: 1
i18n:
zh-CN: Git Hash
en-US: Git Hash
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
protocol: http
http:
# http host: ipv4 ipv6 domain
host: ^_^host^_^
# http port
port: ^_^service-port^_^
# http url
url: '/status'
timeout: ^_^timeout^_^
# http method: GET POST PUT DELETE PATCH
method: GET
# http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule
parseType: jsonPath
parseScript: '$'
- name: stores
i18n:
zh-CN: 存储
en-US: Stores
priority: 1
fields:
- field: address
type: 1
i18n:
zh-CN: 地址
en-US: Address
- field: version
type: 1
i18n:
zh-CN: 版本
en-US: Version
- field: status_address
type: 1
i18n:
zh-CN: 状态地址
en-US: Status Address
- field: deploy_path
type: 1
i18n:
zh-CN: 部署路径
en-US: Deploy Path
- field: state_name
type: 1
i18n:
zh-CN: 状态名称
en-US: State Name
- field: capacity
type: 1
i18n:
zh-CN: 容量
en-US: Capacity
- field: available
type: 1
i18n:
zh-CN: 可用
en-US: Available
- field: used_size
type: 1
i18n:
zh-CN: 已用
en-US: Used
- field: start_ts
type: 1
i18n:
zh-CN: 启动时间
en-US: Start Time
- field: last_heartbeat_ts
type: 1
i18n:
zh-CN: 上次心跳时间
en-US: Last Heartbeat Time
- field: uptime
type: 1
i18n:
zh-CN: 启动时长
en-US: Uptime
aliasFields:
- $.store.address
- $.store.version
- $.store.status_address
- $.store.deploy_path
- $.store.state_name
- $.status.capacity
- $.status.available
- $.status.used_size
- $.status.start_ts
- $.status.last_heartbeat_ts
- $.status.uptime
calculates:
- address=$.store.address
- version=$.store.version
- status_address=$.store.status_address
- deploy_path=$.store.deploy_path
- state_name=$.store.state_name
- capacity=$.status.capacity
- available=$.status.available
- used_size=$.status.used_size
- start_ts=$.status.start_ts
- last_heartbeat_ts=$.status.last_heartbeat_ts
- uptime=$.status.uptime
protocol: http
http:
host: ^_^host^_^
port: ^_^pd-port^_^
url: '/pd/api/v1/stores'
timeout: ^_^timeout^_^
method: GET
parseType: jsonPath
parseScript: '$.stores.*'
- name: basic
i18n:
zh-CN: 基本信息
en-US: Basic Info
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
priority: 2
# collect metrics content
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
- field: version
type: 1
i18n:
zh-CN: 版本
en-US: Version
label: true
- field: port
type: 1
i18n:
zh-CN: 端口
en-US: Port
- field: datadir
type: 1
i18n:
zh-CN: 数据目录
en-US: Data Directory
- field: max_connections
type: 0
i18n:
zh-CN: 最大连接数
en-US: Max Connections
# (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
aliasFields:
- version
- port
- datadir
- max_connections
# (optional)mapping and conversion expressions, use these and aliasField above to calculate metrics value
# eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
calculates:
- port=port
- datadir=datadir
- max_connections=max_connections
- version=version+"_"+version_compile_os+"_"+version_compile_machine
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
protocol: jdbc
# the config content when protocol is jdbc
jdbc:
# host: ipv4 ipv6 host
host: ^_^host^_^
# port
port: ^_^port^_^
# database platform name
platform: mysql
username: ^_^username^_^
password: ^_^password^_^
database: ^_^database^_^
timeout: ^_^timeout^_^
# SQL Query Method:oneRow, multiRow, columns
queryType: columns
# sql
sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port';
# JDBC url
url: ^_^url^_^
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# The monitoring type category:service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
category: db
# The monitoring type eg: linux windows tomcat mysql aws...
app: tidb
# The monitoring i18n name
name:
zh-CN: TiDB数据库
en-US: TiDB
# The description and help of this monitoring type
help:
zh-CN: HertzBeat 使用 HTTP 和 JDBC 协议对 TiDB 的通用性能指标进行采集监控,点击查看开启步骤</a>。<br>您可以点击“<i>新建 TiDB 数据库</i>”并进行配置,或者选择“<i>更多操作</i>”,导入已有配置。
en-US: HertzBeat monitors general performance metrics of TiDB through HTTP and JDBC protocol. <br> You could click the "<i>New TiDB</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>".
zh-TW: HertzBeat 使用 HTTP 和 JDBC 協議對 TiDB 的通用性能指標進行採集監控,點擊查看開啟步驟</a>。 <br>您可以點擊“<i>新建 TiDB 數據庫</i>”並進行配置,或者選擇“<i>更多操作</i>”,導入已有配置。
helpLink:
zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/tidb
en-US: https://hertzbeat.apache.org/docs/help/tidb
# Input params define for monitoring(render web ui by the definition)
params:
# field-param field key
- field: host
# name-param field display i18n name
name:
zh-CN: 目标Host
en-US: Target Host
# type-param field type(most mapping the html input type)
type: host
# required-true or false
required: true
# field-param field key
- field: port
# name-param field display i18n name
name:
zh-CN: JDBC 端口
en-US: JDBC Port
# type-param field type(most mapping the html input type)
type: number
# when type is number, range is required
range: '[0,65535]'
# required-true or false
required: false
defaultValue: 4000
# hide param-true or false
hide: true
- field: service-port
name:
zh-CN: Service 端口
en-US: Service Port
type: number
range: '[0,65535]'
required: true
defaultValue: 10080
- field: pd-port
name:
zh-CN: PD 端口
en-US: PD Port
type: number
range: '[0,65535]'
required: false
defaultValue: 2379
- field: timeout
name:
zh-CN: 查询超时时间(ms)
en-US: Query Timeout(ms)
type: number
required: false
defaultValue: 6000
- field: database
name:
zh-CN: 数据库名称
en-US: Database Name
type: text
required: false
hide: true
- field: username
name:
zh-CN: 用户名
en-US: Username
type: text
limit: 50
required: false
hide: true
- field: password
name:
zh-CN: 密码
en-US: Password
type: password
required: false
hide: true
- field: url
name:
zh-CN: JDBC URL
en-US: JDBC URL
type: text
required: false
hide: true
# collect metrics config list
metrics:
# metrics - status
- name: status
i18n:
zh-CN: 状态
en-US: Status
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
priority: 0
# collect metrics content
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
- field: connections
type: 0
i18n:
zh-CN: 连接数
en-US: Connections
- field: version
type: 1
i18n:
zh-CN: 版本
en-US: Version
- field: git_hash
type: 1
i18n:
zh-CN: Git Hash
en-US: Git Hash
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
protocol: http
http:
# http host: ipv4 ipv6 domain
host: ^_^host^_^
# http port
port: ^_^service-port^_^
# http url
url: '/status'
timeout: ^_^timeout^_^
# http method: GET POST PUT DELETE PATCH
method: GET
# http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule
parseType: jsonPath
parseScript: '$'
- name: stores
i18n:
zh-CN: 存储
en-US: Stores
priority: 1
fields:
- field: address
type: 1
i18n:
zh-CN: 地址
en-US: Address
- field: version
type: 1
i18n:
zh-CN: 版本
en-US: Version
- field: status_address
type: 1
i18n:
zh-CN: 状态地址
en-US: Status Address
- field: deploy_path
type: 1
i18n:
zh-CN: 部署路径
en-US: Deploy Path
- field: state_name
type: 1
i18n:
zh-CN: 状态名称
en-US: State Name
- field: capacity
type: 1
i18n:
zh-CN: 容量
en-US: Capacity
- field: available
type: 1
i18n:
zh-CN: 可用
en-US: Available
- field: used_size
type: 1
i18n:
zh-CN: 已用
en-US: Used
- field: start_ts
type: 1
i18n:
zh-CN: 启动时间
en-US: Start Time
- field: last_heartbeat_ts
type: 1
i18n:
zh-CN: 上次心跳时间
en-US: Last Heartbeat Time
- field: uptime
type: 1
i18n:
zh-CN: 启动时长
en-US: Uptime
aliasFields:
- $.store.address
- $.store.version
- $.store.status_address
- $.store.deploy_path
- $.store.state_name
- $.status.capacity
- $.status.available
- $.status.used_size
- $.status.start_ts
- $.status.last_heartbeat_ts
- $.status.uptime
calculates:
- address=$.store.address
- version=$.store.version
- status_address=$.store.status_address
- deploy_path=$.store.deploy_path
- state_name=$.store.state_name
- capacity=$.status.capacity
- available=$.status.available
- used_size=$.status.used_size
- start_ts=$.status.start_ts
- last_heartbeat_ts=$.status.last_heartbeat_ts
- uptime=$.status.uptime
protocol: http
http:
host: ^_^host^_^
port: ^_^pd-port^_^
url: '/pd/api/v1/stores'
timeout: ^_^timeout^_^
method: GET
parseType: jsonPath
parseScript: '$.stores.*'
- name: basic
i18n:
zh-CN: 基本信息
en-US: Basic Info
# metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
# priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
priority: 2
# collect metrics content
fields:
# field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
- field: version
type: 1
i18n:
zh-CN: 版本
en-US: Version
label: true
- field: port
type: 1
i18n:
zh-CN: 端口
en-US: Port
- field: datadir
type: 1
i18n:
zh-CN: 数据目录
en-US: Data Directory
- field: max_connections
type: 0
i18n:
zh-CN: 最大连接数
en-US: Max Connections
# (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
aliasFields:
- version
- port
- datadir
- max_connections
# (optional)mapping and conversion expressions, use these and aliasField above to calculate metrics value
# eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
calculates:
- port=port
- datadir=datadir
- max_connections=max_connections
- version=version+"_"+version_compile_os+"_"+version_compile_machine
# the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
protocol: jdbc
# the config content when protocol is jdbc
jdbc:
# host: ipv4 ipv6 host
host: ^_^host^_^
# port
port: ^_^port^_^
# database platform name
platform: mysql
username: ^_^username^_^
password: ^_^password^_^
database: ^_^database^_^
timeout: ^_^timeout^_^
# SQL Query Method:oneRow, multiRow, columns
queryType: columns
# sql
sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port';
# JDBC url
url: ^_^url^_^

View File

@ -1,14 +1,14 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

View File

@ -53,7 +53,7 @@ Pop-Location
# package release artifacts
Write-Host "Archiving source code..."
git archive --format=tar.gz --output="dist/apache-hertzbeat-$version-incubating-src.tar.gz" --prefix=apache-hertzbeat-$version-incubating-src/$rcNumber git archive --format=tar.gz --output="dist/apache-hertzbeat-$version-incubating-src.tar.gz" --prefix=apache-hertzbeat-$version-incubating-src/$rcNumber
git archive --format=tar.gz --output="dist/apache-hertzbeat-$version-incubating-src.tar.gz" --prefix=apache-hertzbeat-$version-incubating-src/ release-$version-$rcNumber
# sign release artifacts
Write-Host "Signing release artifacts..."

View File

@ -1,58 +1,58 @@
::ng-deep {
.row {
margin-top: 6px;
.ruleset {
border: 1px solid #CCC;
}
}
.tree {
list-style: none;
margin: 4px 0 2px;
}
.tree:empty {
margin: 0px;
}
.ruleset-invalid {
border: none!important;
.ruleset {
border: 1px solid #ff4d4f !important;
}
>p {
margin: 0!important;
color: #ff4d4f !important;
}
}
.ruleset {
min-width: 400px;
overflow-x: auto;
padding: 6px 8px;
}
.rule {
display: flex;
gap: 10px;
min-width: 300px;
overflow-x: auto;
padding: 6px 8px;
border: 1px solid #CCC;
.q-rule-content {
flex: 1;
display: flex;
flex-wrap: wrap;
gap: 10px;
}
.q-rule-actions {
flex-shrink: 0;
}
}
}
::ng-deep {
.row {
margin-top: 6px;
.ruleset {
border: 1px solid #CCC;
}
}
.tree {
list-style: none;
margin: 4px 0 2px;
}
.tree:empty {
margin: 0px;
}
.ruleset-invalid {
border: none!important;
.ruleset {
border: 1px solid #ff4d4f !important;
}
>p {
margin: 0!important;
color: #ff4d4f !important;
}
}
.ruleset {
min-width: 400px;
overflow-x: auto;
padding: 6px 8px;
}
.rule {
display: flex;
gap: 10px;
min-width: 300px;
overflow-x: auto;
padding: 6px 8px;
border: 1px solid #CCC;
.q-rule-content {
flex: 1;
display: flex;
flex-wrap: wrap;
gap: 10px;
}
.q-rule-actions {
flex-shrink: 0;
}
}
}

View File

@ -1,31 +1,31 @@
:host ::ng-deep {
.item{
padding-left: 32px!important;
.ant-menu-title-content {
gap: 8px;
display: flex;
align-items: center;
:first-child {
flex-shrink: 0;
}
.label {
flex: 1;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
.ant-spin-container {
height: 100%;
display: flex;
overflow: hidden;
flex-direction: column;
}
}
:host ::ng-deep {
.item{
padding-left: 32px!important;
.ant-menu-title-content {
gap: 8px;
display: flex;
align-items: center;
:first-child {
flex-shrink: 0;
}
.label {
flex: 1;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
.ant-spin-container {
height: 100%;
display: flex;
overflow: hidden;
flex-direction: column;
}
}

View File

@ -1,24 +1,24 @@
:host {
::ng-deep {
.ant-input-prefix, .ant-input-suffix {
display: flex;
gap: 4px;
* {
margin-right: 0!important;
}
}
.ant-input-prefix {
margin-right: 0!important;
>:last-child {
margin-right: 4px!important;
}
}
.ant-input-suffix {
flex-direction: row-reverse;
margin-left: 0!important;
>:last-child {
margin-left: 4px!important;
}
}
}
}
:host {
::ng-deep {
.ant-input-prefix, .ant-input-suffix {
display: flex;
gap: 4px;
* {
margin-right: 0!important;
}
}
.ant-input-prefix {
margin-right: 0!important;
>:last-child {
margin-right: 4px!important;
}
}
.ant-input-suffix {
flex-direction: row-reverse;
margin-left: 0!important;
>:last-child {
margin-left: 4px!important;
}
}
}
}

View File

@ -1,4 +1,4 @@
:host {
::ng-deep {
}
}
:host {
::ng-deep {
}
}

View File

@ -1,20 +1,20 @@
.wrapper {
display: flex;
margin-bottom: 20px;
justify-content: space-between;
.container {
display: flex;
gap: 8px;
align-items: center;
}
.container:first-child {
gap: 0px;
justify-content: flex-start;
}
.container:last-child {
justify-content: flex-end;
}
}
.wrapper {
display: flex;
margin-bottom: 20px;
justify-content: space-between;
.container {
display: flex;
gap: 8px;
align-items: center;
}
.container:first-child {
gap: 0px;
justify-content: flex-start;
}
.container:last-child {
justify-content: flex-end;
}
}

File diff suppressed because it is too large Load Diff