junjun
|
7618a12d24
|
refactor: 优化calcite自定义函数性能
|
2024-02-28 15:14:30 +08:00 |
|
junjun
|
8113d635cf
|
refactor: 优化calcite自定义函数性能
|
2024-02-28 13:50:34 +08:00 |
|
junjun
|
f78eb9f2f6
|
refactor: 优化calcite自定义函数性能
|
2024-02-28 12:26:56 +08:00 |
|
junjun
|
c5d97a3d5f
|
fix: 修复Impala分页需先排序
|
2024-02-27 17:59:00 +08:00 |
|
wangjiahao
|
45cd9cb300
|
fix(仪表板): 修复社区板仪表板因不支持水印设置导致的控制台报错问题
|
2024-02-23 16:53:49 +08:00 |
|
fit2cloud-chenyw
|
7120fd0bae
|
feat(X-Pack): 外观配置页面
|
2024-02-21 11:47:40 +08:00 |
|
wangjiahao
|
6ff51a142a
|
refactor(系统设置): 更新水印管理权限flyway
|
2024-02-19 18:11:39 +08:00 |
|
wisonic-s
|
823ec3b5d1
|
fix(视图): 修复明细表分页状态下只能导出当前页的数据 #7972
|
2024-02-19 11:51:40 +08:00 |
|
wangjiahao
|
c15b098d46
|
feat(工作台): 工作台我的收藏页增加直接取消收藏操作
|
2024-02-18 14:38:51 +08:00 |
|
junjun
|
5344368145
|
refactor: 使用Calcite新方法替换过时方法
|
2024-02-01 11:37:04 +08:00 |
|
junjun
|
e150ef313f
|
fix: 降低数值取值精度来规避doris自身bug
|
2024-01-31 17:42:30 +08:00 |
|
fit2cloud-chenyw
|
5a79b5a079
|
feat(*): 仪表板大屏查看日志
|
2024-01-30 15:41:00 +08:00 |
|
fit2cloud-chenyw
|
bf6f744281
|
perf(X-Pack): 日志模块使用异步线程避免与主线程事务相互影响
|
2024-01-30 11:39:52 +08:00 |
|
junjun
|
0c4616eb67
|
refactor(数据集): 详细展示Calcite执行SQL时的报错提示
|
2024-01-29 16:50:57 +08:00 |
|
junjun
|
fc7a1c0032
|
fix: 降低整数取值精度来规避doris自身bug
|
2024-01-29 09:47:53 +08:00 |
|
wangjiahao
|
096de8a3d1
|
fix: 修复资源文件夹可以移动到其自身的子文件夹造成移动后文件夹不显示问题
|
2024-01-28 19:16:31 +08:00 |
|
junjun
|
6cf62480d0
|
fix(视图): 修复列脱敏后视图报错的问题
|
2024-01-25 17:10:46 +08:00 |
|
taojinlong
|
db00585e67
|
fix(数据源): DataEase v2 在 Excel 数据比较多的情况上传后数据为空 #7722
|
2024-01-25 16:48:00 +08:00 |
|
taojinlong
|
ac736abe0c
|
refactor(数据源): 拆分接口
|
2024-01-25 14:38:44 +08:00 |
|
taojinlong
|
3fca6dce19
|
fix(数据源): 校验状态没有记录改变
|
2024-01-25 12:53:40 +08:00 |
|
taojinlong
|
03bb052183
|
fix: oracle 支持视图
|
2024-01-24 17:05:31 +08:00 |
|
taojinlong
|
02d31c6dca
|
fix: 升级json-path依赖
|
2024-01-23 12:31:16 +08:00 |
|
junjun
|
6e79d60032
|
refactor: 增加SQL片段预览执行SQL查看
|
2024-01-23 11:26:39 +08:00 |
|
fit2cloud-chenyw
|
783594e1ab
|
perf: 升级json-path依赖
|
2024-01-23 10:25:35 +08:00 |
|
fit2cloud-chenyw
|
e5b38d9fd1
|
Merge pull request #7742 from dataease/pr@dev-v2@perf_log_grid
perf: 日志列表增加状态字段
|
2024-01-22 16:52:15 +08:00 |
|
fit2cloud-chenyw
|
c9243c8ab6
|
perf: 日志列表增加状态字段
|
2024-01-22 16:49:06 +08:00 |
|
wangjiahao
|
9ec95b2b82
|
fix: 修复复制可视化资源出现权限变更的问题
|
2024-01-22 13:33:50 +08:00 |
|
ulleo
|
d07161138b
|
Merge pull request #7718 from ulleo/dev-v2
feat: 图表增加指标卡
|
2024-01-19 18:07:53 +08:00 |
|
ulleo
|
ba18375d9c
|
feat: 图表增加指标卡
|
2024-01-19 18:06:33 +08:00 |
|
taojinlong
|
4128adf5fc
|
fix: 限制 mysql 非法参数
|
2024-01-18 17:53:34 +08:00 |
|
fit2cloud-chenyw
|
7c117335ff
|
perf: 同步游离资源
|
2024-01-18 12:13:11 +08:00 |
|
junjun
|
babf61f8e9
|
refactor: 修复数据集预览报错提示
|
2024-01-18 10:04:39 +08:00 |
|
fit2cloud-chenyw
|
f040c2db41
|
feat: pom错误
|
2024-01-18 09:12:38 +08:00 |
|
fit2cloud-chenyw
|
9af8a75ebb
|
feat: 首次升级企业版监测游离资源
|
2024-01-18 09:05:33 +08:00 |
|
wangjiahao
|
278cee6d20
|
refactor: 工作台模版展示优化
|
2024-01-17 10:54:52 +08:00 |
|
fit2cloud-chenyw
|
e81befdc67
|
fix: 2.3flyway冲突
|
2024-01-16 16:24:05 +08:00 |
|
fit2cloud-chenyw
|
2158db4f41
|
Merge branch 'dev-v2' into pr@dev-v2@fix_flyway
|
2024-01-16 16:16:20 +08:00 |
|
fit2cloud-chenyw
|
2daad1bd25
|
fix: flyway错误包括desktop版本
|
2024-01-16 16:07:39 +08:00 |
|
王嘉豪
|
028f6170bb
|
Merge branch 'dev-v2' into pr@dev-v2@refactor_recommond-template
|
2024-01-16 16:00:36 +08:00 |
|
wangjiahao
|
881a60dfa3
|
refactor: 工作台中的推荐模板中可以展示自定义的用户模板
|
2024-01-16 15:57:57 +08:00 |
|
王嘉豪
|
18cd8ce3c5
|
Merge pull request #7645 from dataease/pr@dev-v2@revert_canvas
revert: 去除多余依赖
|
2024-01-16 10:35:02 +08:00 |
|
wangjiahao
|
e07d0ba640
|
revert: 去除多余依赖
|
2024-01-16 10:21:37 +08:00 |
|
王嘉豪
|
eda1b6286f
|
Merge pull request #7641 from dataease/pr@dev-v2@refactor_canvas
Pr@dev v2@refactor canvas
|
2024-01-16 09:41:25 +08:00 |
|
wangjiahao
|
23dfe4ab7f
|
refactor(数据大屏): 大屏位置定位数据变更为展示原始数据不再随缩放改变
|
2024-01-16 09:40:25 +08:00 |
|
fit2cloud-chenyw
|
3a87318f4b
|
Merge pull request #7639 from dataease/pr@dev-v2@feat_share_from_xpack
feat: 分享功能从xpack下放到core
|
2024-01-15 18:20:02 +08:00 |
|
fit2cloud-chenyw
|
20e44797f4
|
feat: 分享功能从xpack下放到core
|
2024-01-15 18:16:53 +08:00 |
|
taojinlong
|
539d407342
|
fix: 数据源校验返回信息
|
2024-01-15 18:08:48 +08:00 |
|
fit2cloud-chenyw
|
d813e44765
|
fix: 登录日志导致社区版无lic无法登录
|
2024-01-15 16:23:49 +08:00 |
|
fit2cloud-chenyw
|
297764a4a3
|
fix: 数据结构注释导致安装失败
|
2024-01-12 17:22:53 +08:00 |
|
taojinlong
|
fda351bb00
|
Merge pull request #7614 from dataease/pr@dev-v2@feat_timeout
fix: 解析sql出错
|
2024-01-12 16:24:53 +08:00 |
|
taojinlong
|
a90c2e65b9
|
fix: 解析sql出错
|
2024-01-12 16:24:16 +08:00 |
|
fit2cloud-chenyw
|
fac4205974
|
perf: 同步任务模块api依赖缺失
|
2024-01-12 11:22:16 +08:00 |
|
taojinlong
|
a7c7f0b5da
|
feat: 【系统设置】支持系统参数设置-前端超时时间设置
|
2024-01-11 17:01:17 +08:00 |
|
王嘉豪
|
515aa93af5
|
Merge pull request #7585 from dataease/pr@dev-v2@refactor_canvas
refactor: 画布样式逻辑调整
|
2024-01-11 15:11:17 +08:00 |
|
wangjiahao
|
1a0083d285
|
refactor: 画布样式逻辑调整
|
2024-01-11 15:09:17 +08:00 |
|
fit2cloud-chenyw
|
a42660c315
|
Merge pull request #7574 from dataease/pr@dev-v2@sync-task
feat(系统管理-同步管理):
|
2024-01-11 15:08:29 +08:00 |
|
fit2cloud-chenyw
|
4953bb5d3c
|
Merge pull request #7583 from dataease/pr@dev-v2@perf_remove_hutool
perf: 移除hutool
|
2024-01-11 14:44:26 +08:00 |
|
fit2cloud-chenyw
|
c9685da158
|
perf: 移除hutool
|
2024-01-11 14:43:23 +08:00 |
|
jianneng-fit2cloud
|
1de9d27115
|
Merge branch 'dev-v2' into pr@dev-v2@sync-task
|
2024-01-11 14:02:11 +08:00 |
|
王嘉豪
|
4e531af454
|
Merge pull request #7580 from dataease/pr@dev-v2@refactor_style
refactor: 可视化资源树水印等样式逻辑调整
|
2024-01-11 10:43:00 +08:00 |
|
wangjiahao
|
1ce8f6418c
|
refactor: 可视化资源树水印等样式逻辑调整
|
2024-01-11 10:40:40 +08:00 |
|
王嘉豪
|
9c6ee9b18b
|
Merge pull request #7519 from ZhaoQian1222/pr@dev-v2@update_table_desc
fix:添加数据库表字段描述
|
2024-01-11 10:35:31 +08:00 |
|
jianneng-fit2cloud
|
53c9d1731e
|
feat(系统管理-同步管理):
1.添加目标数据源同步到数据准备
2.UI调整
|
2024-01-10 17:21:08 +08:00 |
|
fit2cloud-chenyw
|
a95fe5ee7b
|
perf: 升级版本号
|
2024-01-10 15:16:43 +08:00 |
|
王嘉豪
|
33f3949036
|
Merge pull request #7555 from dataease/pr@dev-v2@feat_watermark
feat: 可视化资源支持显示水印
|
2024-01-09 17:10:29 +08:00 |
|
wangjiahao
|
f3413e91fa
|
feat: 可视化资源支持显示水印
|
2024-01-09 17:08:28 +08:00 |
|
fit2cloud-chenyw
|
0e640403cd
|
Merge pull request #7549 from dataease/pr@dev-v2@feat_log
Pr@dev v2@feat log
|
2024-01-09 10:56:37 +08:00 |
|
fit2cloud-chenyw
|
ee8db44375
|
feat: 日志模块
|
2024-01-09 10:49:38 +08:00 |
|
zhaoqian
|
5a688dd3db
|
fix:修正数据库表字段描述
|
2024-01-03 16:54:21 +08:00 |
|
taojinlong
|
c63c1c4779
|
fix: 识别csv 字段类型
|
2024-01-03 15:39:01 +08:00 |
|
taojinlong
|
237c3c37bc
|
fix:【数据源】-本地Excel文件创建的数据源数据预览为空
|
2023-12-29 12:16:21 +08:00 |
|
junjun
|
d4f5fb95bf
|
fix: 数据集重名校验
|
2023-12-28 12:55:07 +08:00 |
|
fit2cloud-chenyw
|
1fd31825fb
|
perf: 模板管理文案
|
2023-12-28 09:52:22 +08:00 |
|
fit2cloud-chenyw
|
21a694dd55
|
feat: 升级版本号到2.2.0
|
2023-12-27 15:53:42 +08:00 |
|
王嘉豪
|
1964142f2a
|
Merge pull request #7408 from dataease/pr@dev-v2@refactor_mark
style: 样式优化
|
2023-12-27 15:50:47 +08:00 |
|
wangjiahao
|
fee4c82b43
|
style: 样式优化
|
2023-12-27 15:47:39 +08:00 |
|
王嘉豪
|
2a7655e885
|
Merge branch 'dev-v2' into pr@dev-v2@refactor_label
|
2023-12-27 15:30:46 +08:00 |
|
wangjiahao
|
a6639f7b6d
|
refactor: 文案修改
|
2023-12-27 15:20:29 +08:00 |
|
Junjun
|
5f0ae95072
|
Merge pull request #7395 from dataease/pr@dev-v2@fix_filter
fix: 修复过滤组件过滤时间戳不显示的问题 #7313
|
2023-12-27 12:36:05 +08:00 |
|
junjun
|
31562676ca
|
fix: 修复过滤组件过滤时间戳不显示的问题 #7313
|
2023-12-27 12:33:04 +08:00 |
|
fit2cloud-chenyw
|
e0661b9228
|
perf: maven打包脚本
|
2023-12-27 12:31:42 +08:00 |
|
fit2cloud-chenyw
|
84e5067528
|
perf: maven打包脚本
|
2023-12-27 09:55:28 +08:00 |
|
fit2cloud-chenyw
|
f8e7898771
|
perf: maven打包脚本
|
2023-12-26 18:44:09 +08:00 |
|
junjun
|
f65fde1a78
|
fix: 拼写错误
|
2023-12-26 10:58:37 +08:00 |
|
junjun
|
198b690d16
|
fix: 修复过滤组件过滤时间戳不显示的问题 #7313
|
2023-12-26 10:00:30 +08:00 |
|
王嘉豪
|
810576b1c2
|
Merge pull request #7342 from dataease/pr@dev-v2@refactor_style
Pr@dev v2@refactor style
|
2023-12-25 20:45:56 +08:00 |
|
wangjiahao
|
6865bebaff
|
refactor: 修改文案
|
2023-12-25 20:29:58 +08:00 |
|
fit2cloud-chenyw
|
1001e72922
|
Merge pull request #7339 from dataease/pr@dev-v2@feat_front_base_path
Pr@dev v2@feat front base path
|
2023-12-25 18:51:52 +08:00 |
|
fit2cloud-chenyw
|
614e0fc0a5
|
feat: 前端静态资源增加访问前缀适配打包脚本
|
2023-12-25 18:51:13 +08:00 |
|
junjun
|
d652d48241
|
fix: 修复过滤组件过滤时间戳不显示的问题 #7313
|
2023-12-25 17:41:07 +08:00 |
|
junjun
|
c708761a4a
|
fix: 修复过滤组件过滤时间戳不显示的问题 #7313
|
2023-12-25 17:17:42 +08:00 |
|
taojinlong
|
0e6e1ad1e3
|
Merge pull request #7305 from dataease/pr@dev-v2@fixDatasource
fix: 【数据源】-本地Excel文件创建的数据源数据预览为空
|
2023-12-25 10:50:18 +08:00 |
|
fit2cloud-chenyw
|
c19b17921e
|
feat: 日志模块
|
2023-12-22 15:39:01 +08:00 |
|
王嘉豪
|
412b2e589b
|
Merge pull request #7294 from dataease/pr@dev-v2@refactor_template-manage
refactor: 优化模版管理批量操作
|
2023-12-22 14:54:15 +08:00 |
|
wangjiahao
|
87921b27d5
|
refactor: 优化模版管理批量操作
|
2023-12-22 14:51:31 +08:00 |
|
王嘉豪
|
aae521b847
|
Merge pull request #7279 from dataease/pr@dev-v2@fix_package
fix: 打包报错
|
2023-12-22 10:37:27 +08:00 |
|
wangjiahao
|
8927d9e51a
|
fix: 打包报错
|
2023-12-22 10:33:38 +08:00 |
|
王嘉豪
|
d79f4f53be
|
Merge pull request #7272 from dataease/pr@dev-v2@feat_batch
feat: 模版管理支持批量操作
|
2023-12-21 21:23:00 +08:00 |
|
wangjiahao
|
042fd6e07c
|
feat: 模版管理支持批量操作
|
2023-12-21 21:21:15 +08:00 |
|
王嘉豪
|
53273aebfc
|
Merge pull request #7265 from dataease/pr@dev-v2@refactor_template-manage
Pr@dev v2@refactor template manage
|
2023-12-21 16:46:07 +08:00 |
|
wangjiahao
|
3ebeb687ca
|
refactor: 优化模版管理
|
2023-12-21 16:43:13 +08:00 |
|
taojinlong
|
797e94d72b
|
fix: 【数据源】-本地Excel文件创建的数据源数据预览为空
|
2023-12-21 16:28:32 +08:00 |
|
taojinlong
|
5a0d12a7d7
|
fix: 【查询组件】-时间范围绑定参数,无法获取可绑定参数
|
2023-12-21 15:30:23 +08:00 |
|
fit2cloud-chenyw
|
055ff852b1
|
Merge pull request #7239 from dataease/pr@dev-v2@perf_api_doc_sys
perf: 系统设置api接口文档
|
2023-12-20 17:57:29 +08:00 |
|
fit2cloud-chenyw
|
5c009d5473
|
perf: 系统设置api接口文档
|
2023-12-20 17:55:37 +08:00 |
|
taojinlong
|
fc3b3cec3a
|
fix: 数据源设置同步时间
|
2023-12-20 17:00:40 +08:00 |
|
taojinlong
|
51a5695a60
|
fix: 识别excel字段类型
|
2023-12-20 17:00:02 +08:00 |
|
fit2cloud-chenyw
|
d164027911
|
perf: api接口文档排序
|
2023-12-20 15:17:46 +08:00 |
|
Zhimin Ruan
|
eb0fcac721
|
chore:删除没用的注释
|
2023-12-20 09:32:11 +08:00 |
|
fit2cloud-chenyw
|
efdb7ff3f3
|
feat: api接口文档
|
2023-12-19 19:23:32 +08:00 |
|
王嘉豪
|
d1f66ce127
|
Merge pull request #7200 from dataease/pr@dev-v2@refactor_copy
refactor: 优化复制操作
|
2023-12-18 19:25:36 +08:00 |
|
wangjiahao
|
531b28c687
|
refactor: 优化复制操作
|
2023-12-18 19:24:58 +08:00 |
|
wisonic-s
|
58f02b5eec
|
fix: 脱敏字段删除改为标记
|
2023-12-07 17:57:08 +08:00 |
|
wisonic-s
|
6c5b3561e5
|
fix: 查询组件去除包含列权限脱敏和禁用的列
|
2023-12-07 16:50:04 +08:00 |
|
fit2cloudrd
|
9a0ba8c2a4
|
Update V2.1__ddl.sql
|
2023-12-07 16:21:21 +08:00 |
|
fit2cloudrd
|
3616e2b6dd
|
Update V2.0__core_ddl.sql
|
2023-12-07 16:16:33 +08:00 |
|
fit2cloud-chenyw
|
8714dca004
|
fix: 定时器相关flyway
|
2023-12-07 15:51:58 +08:00 |
|
fit2cloud-chenyw
|
9c6ef1ca5c
|
fix: 桌面版flyway
|
2023-12-06 21:00:35 +08:00 |
|
王嘉豪
|
62e072aa61
|
Merge pull request #7057 from dataease/pr@dev-v2@refactor_flyway
refactor: 更新flyway
|
2023-12-06 19:42:44 +08:00 |
|
wangjiahao
|
a8ea9459af
|
refactor: 更新flyway
|
2023-12-06 19:40:02 +08:00 |
|
王嘉豪
|
35d034c003
|
Merge pull request #7052 from dataease/pr@dev-v2@pref_change-url
pref: 更换模版中心地址
|
2023-12-06 17:34:39 +08:00 |
|
wangjiahao
|
153ad2bbab
|
pref: 更换模版中心地址
|
2023-12-06 17:33:21 +08:00 |
|
fit2cloud-chenyw
|
54c8831dfc
|
perf: 地理信息上传地图文件验证
|
2023-12-06 11:41:01 +08:00 |
|
fit2cloud-chenyw
|
19feb13f74
|
style: 地理信息树节点超出长度未处理样式
|
2023-12-06 11:20:40 +08:00 |
|
wangjiahao
|
eae5cc7da7
|
fix: 修复模版中存在过滤组件时应用有报错提示问题
|
2023-12-05 15:15:27 +08:00 |
|
wangjiahao
|
a94bac0dd5
|
refactor: 优化最近使用查询逻辑
|
2023-12-05 10:42:34 +08:00 |
|
wangjiahao
|
7b30ad483e
|
refactor: 模版管理支持多标签
|
2023-12-05 09:58:03 +08:00 |
|
wangjiahao
|
4297c21bef
|
refactor: 模版管理支持多标签
|
2023-12-05 09:35:43 +08:00 |
|
fit2cloud-chenyw
|
6af4c59fe8
|
perf: 企业版许可限制机制
|
2023-12-03 14:59:25 +08:00 |
|
fit2cloud-chenyw
|
a6b047b60b
|
perf: 菜单缓存机制禁止持久化
|
2023-12-03 12:28:27 +08:00 |
|
fit2cloud-chenyw
|
49a0ef79bc
|
perf: 分布式国际化
|
2023-12-03 12:10:19 +08:00 |
|
taojinlong
|
cde9664013
|
Merge pull request #6962 from dataease/pr@dev-v2@fixDatasource
fix: 【数据集】列权限自定义脱敏格式显示不正确
|
2023-12-01 03:21:20 -06:00 |
|
fit2cloud-chenyw
|
bbf0093f8c
|
Merge branch 'dev-v2' into pr@dev-v2@feat_toolbox_menu
|
2023-12-01 17:11:56 +08:00 |
|
fit2cloud-chenyw
|
53f61613d6
|
style: 工作台样式恢复
|
2023-12-01 17:08:31 +08:00 |
|
taojinlong
|
d1107c5625
|
fix: 【数据集】列权限自定义脱敏格式显示不正确
|
2023-12-01 16:39:49 +08:00 |
|
wangjiahao
|
c355e6a66e
|
refactor: UI调整,增加调试信息
|
2023-12-01 16:26:08 +08:00 |
|
王嘉豪
|
93a7b23180
|
Merge pull request #6951 from dataease/pr@dev-v2@style_UI-UPDATE
style: UI调整
|
2023-11-30 23:16:16 +08:00 |
|
wangjiahao
|
476cc0be75
|
style: UI调整
|
2023-11-30 23:15:09 +08:00 |
|
王嘉豪
|
03498c9088
|
Merge pull request #6948 from dataease/pr@dev-v2@style_UI
style: UI调整
|
2023-11-30 19:41:49 +08:00 |
|
wangjiahao
|
1b0813f853
|
style: UI调整
|
2023-11-30 19:40:42 +08:00 |
|
taojinlong
|
600bacef33
|
Merge pull request #6940 from dataease/pr@dev-v2@fixDatasource
refactor: 升级版本号
|
2023-11-30 00:03:42 -06:00 |
|
taojinlong
|
d61bbef03f
|
refactor: 升级版本号
|
2023-11-30 14:02:44 +08:00 |
|
taojinlong
|
9cfdf0f9a5
|
Merge pull request #6936 from dataease/pr@dev-v2@fixDatasource
feat: 读取数据源更新频率配置
|
2023-11-29 19:30:04 -06:00 |
|
taojinlong
|
60bfa919bc
|
feat: 读取数据源更新频率配置
|
2023-11-30 09:29:21 +08:00 |
|
王嘉豪
|
86a68b3d3c
|
Merge pull request #6935 from dataease/pr@dev-v2@refactor_create
refactor: 使用模板中心创建UI优化
|
2023-11-30 00:02:48 +08:00 |
|
wangjiahao
|
23a3cbd5d0
|
refactor: 使用模板中心创建UI优化
|
2023-11-30 00:01:55 +08:00 |
|
taojinlong
|
0e4667e5c9
|
Merge pull request #6933 from dataease/pr@dev-v2@fixDatasource
feat: 读取数据源更新频率配置
|
2023-11-29 05:26:47 -06:00 |
|
taojinlong
|
1afa7e612f
|
feat: 读取数据源更新频率配置
|
2023-11-29 19:05:24 +08:00 |
|
fit2cloud-chenyw
|
1bdbfaf3b3
|
perf: 许可控制
|
2023-11-29 18:27:35 +08:00 |
|
wisonic-s
|
ff4411a1ae
|
fix: 空值联动异常
|
2023-11-29 17:22:08 +08:00 |
|