Sign in

简柏林 / thingskit-view · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 960
  • Network
  • Compare
  • Branches 3
  • Tags 0
  • thingskit-view
10 Apr, 2023
20 commits
  • Merge branch 'ww' into 'main_dev' ...
    48be4e64
    fix(backgrounImage): 修复背景图片不能上传
    
    See merge request yunteng/thingskit-view!37
    
    (cherry picked from commit aff15756)
    
    10a6ff0e fix(backgrounImage): 修复背景图片不能上传
    xp.Huang authored
    2023-04-10 10:11:43 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    75555eb4
    perf(assets/external/headbackground): 移除大标题背景的第7张,线上环境会乱码显示,调整大标题2默认高度和字体大小
    
    See merge request yunteng/thingskit-view!36
    
    (cherry picked from commit 2f3df181)
    
    6819a9db perf(external/Composes): 修改大标题默认选中地址回显
    5c4175fb perf(external/Composes): 调整大标题2默认高度和字体大小
    f094bdd4 perf(assets/external/headbackground): 移除大标题背景的第7张,线上环境会乱码显示
    eeb7a185 perf(views/chart/hooks/external): 注释定时请求保存代码
    814c00cf Merge branch 'main_dev' into ft
    40c0f52e perf(external/Composes): 修复摄像头页面刷新不自动播放问题
    xp.Huang authored
    2023-04-10 10:11:16 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    f681952d
    perf(external/Componse): 优化大标题和小标题拖拽设置宽高 ,移除组合下的按钮组件
    
    See merge request yunteng/thingskit-view!35
    
    (cherry picked from commit 7f9ffa34)
    
    ed04f44c perf(external/Componse): 有优化大标题和小标题拖拽设置宽高
    986418f8 perf(external/Componse): 移除组合下的按钮
    7ddb9dc0 Merge branch 'main_dev' into ft
    e25081df perf(external/Componse): 移除组合下的摄像头默认地址
    736453f6 perf(external/Decorates): 调整图标大小为50x50
    fd417c3b perf(external/Composes): 修改大标题默认地址
    9f3b871b perf(assets/external): 修改扩展目录下的背景和大标题背景图片命名规范
    xp.Huang authored
    2023-04-10 10:10:51 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    bcd8f03a
    fix(external/Componse): 修复三个小标题渐变ID值重复问题
    
    See merge request yunteng/thingskit-view!34
    
    (cherry picked from commit ef098c9f)
    
    0e53ffe7 perf(components/GoUserInfo): 覆盖external下的GoUserInfo
    99bf5224 perf(external/HeadCombinations/LeftCenterRightHead): 移除默认值
    3d2e25e2 perf(external/Componse): 修复三个小标题渐变ID值重复问题
    1dc01d4d Merge branch 'main_dev' into ft
    xp.Huang authored
    2023-04-10 10:10:29 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    9f7b0c04
    fix: 修复预览模式下未轮训请求
    
    See merge request yunteng/thingskit-view!33
    
    (cherry picked from commit 6d1c87fb)
    
    3d7ab5e9 fix(preview): 修复预览模式下未轮训请求
    6ce66876 fix(paramsTable.vue): 修复参数表格不能同步删除数据
    4b5a14e3 perf(dynamicParams): 公共接口自定义参数为entityType时增加tooltip提示
    xp.Huang authored
    2023-04-10 10:10:11 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    5d1d3752
    perf(components/GoUserInfo): 覆盖external下的GoUserInfo等
    
    See merge request yunteng/thingskit-view!32
    
    (cherry picked from commit 89ffc88f)
    
    f58186a6 perf(external/Componse): 新增组合下的小标题2
    801c381e perf(external/Componse): 重写信息下的图片
    bffac482 perf(external/Componse): 重写信息下的图片
    52854df6 perf(external/Componse): 新增组合下的小标题3
    d337d91a feat(src/assets): 新增了图片,这里升级版本有冲突WARNING
    43bc7e14 perf(external/Componse): 修改了图片名字
    29886bb4 perf(views/ContentHeader/headerRightBtn): 新增了external扩展目录,这里升级版本有冲突WARNING
    c989940b perf(views/ContentHeader/headerLeftBtn): 新增了external扩展目录,这里升级版本有冲突WARNING
    2b852e4a perf(views/ContentHeader/headerLeftBtn): 新增了external扩展目录,这里升级版本有冲突WARNING
    e990e729 perf(components/GoUserInfo): 覆盖external下的GoUserInfo
    xp.Huang authored
    2023-04-10 10:09:45 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    0a506eab
    feat(share): 新增分享页面
    
    See merge request yunteng/thingskit-view!31
    
    (cherry picked from commit 931d73b7)
    
    f051a44f fix(dynamicRequest): 动态请求headers存在空属性会导致请求失败
    06bc03cd feat(share): 新增分享页面
    3dc03093 perf(share): 优化分享页面渲染
    2d795708 fix(DEFECT-1102): 修复图标弹跳和定制效果冲突
    xp.Huang authored
    2023-04-10 10:09:12 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    495bc5cb
    perf(external/Componse): 修改小标题1,缩放未居中
    
    See merge request yunteng/thingskit-view!30
    
    (cherry picked from commit 90872f02)
    
    fb611578 perf(external/Componse): 移除组合下的小标题2
    0071ec7b perf(Charts/Mores/WaterPolo/config.vue): 禁用了水球数值输入框,改了他的源码,WARNING:这里有冲突
    c3f8e860 perf(external/Componse): 修改小标题1,缩放多余的部分
    e5302036 perf(external/Componse): 修改小标题1,缩放未居中
    xp.Huang authored
    2023-04-10 10:08:35 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    3782168c
    fix(public interface): 修复动态请求无法选择参数
    
    See merge request yunteng/thingskit-view!29
    
    (cherry picked from commit e42dc58e)
    
    365cee17 fix(public interface): 修复动态请求无法选择参数
    xp.Huang authored
    2023-04-10 10:08:11 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    7755f051
    perf(external/Componse): 修复摄像头更改源地址无法切换播放问题合并ww代码
    
    See merge request yunteng/thingskit-view!28
    
    (cherry picked from commit 760dd9a8)
    
    17e74d96 fix(external/Componse): 修复摄像头更换源地址无法播放问题
    06278a78 perf(external/Componse): 移除大标题无用注释和修改title为dataset
    bd009920 perf(external/Componse): 修复摄像头更改源地址无法切换播放问题
    ab3e129b perf(external/Componse): 修复摄像头更改源地址无法切换播放问题合并ww代码
    xp.Huang authored
    2023-04-10 10:07:32 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    1a7fc3ca
    fix(get publicInterface): 修复获取公共接口参数传递错误
    
    See merge request yunteng/thingskit-view!27
    
    (cherry picked from commit 49c465bf)
    
    8b389c18 fix(get publicInterface): 修复获取公共接口参数传递错误
    404e3c93 feat(dynamic request): 新增动态接口body参数和header参数
    xp.Huang authored
    2023-04-10 10:06:34 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    7a197ffc
    fix(types): 修复类型错误
    
    See merge request yunteng/thingskit-view!26
    
    (cherry picked from commit 15680928)
    
    a5c64234 fix(types): 修复类型错误
    555f2d6c fix(types): 修复类型错误
    f07990bb fix(auto save): 修复自动保存接口参数传递错误
    xp.Huang authored
    2023-04-10 10:06:03 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    3b1f1b50
    feat: socket实时更新,title修改
    
    See merge request yunteng/thingskit-view!25
    
    (cherry picked from commit 39c1f69c)
    
    f76ce29a feat(socket): 修复socket无法实时更新
    5dda291d fix(dynamicForm): 修复公共接口日期类型组件无法回显值
    6d1b6623 feat(title): 标题修改和保存
    83d9df9d fix(Icon): 修复icon颜色无法变更
    9177697d fix(Icon): 图标为圆形边框时隐藏四周锚点
    5189c225 fix(dynamic request): 修复动态请求header回显
    xp.Huang authored
    2023-04-10 10:05:29 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    88f7ca7b
    chore(@types/video.js): 新增video.js类型声明包
    
    See merge request yunteng/thingskit-view!24
    
    (cherry picked from commit 29bde1de)
    
    f48a8d79 chore(@types/video.js): 新增video.js类型声明包
    xp.Huang authored
    2023-04-10 10:04:41 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main_dev' ...
    bb4ff912
    feat(external/Componse): 新增摄像头
    
    See merge request yunteng/thingskit-view!23
    
    (cherry picked from commit 30fa76f8)
    
    66d7fcfc perf(external/Componse): 修复大标题无法自适应
    8d1bc60b perf(external/Componse): 新增摄像头
    210506eb Merge branch 'main_dev' into ft
    xp.Huang authored
    2023-04-10 10:04:00 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    51dd64be
    feat(request): 新增socket请求方式
    
    See merge request yunteng/thingskit-view!21
    
    (cherry picked from commit 3e2f9d0a)
    
    8ea717de feat(request): 新增socket请求方式
    xp.Huang authored
    2023-04-10 10:03:19 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    58b3b9d6
    fix(packages/compoents/external): 修复拓展组件生产环境无法使用问题
    
    See merge request yunteng/thingskit-view!20
    
    (cherry picked from commit 8a6838f4)
    
    d22eabd2 fix(SqlConfiguration.vue): 修复描述文字错误
    22a1a2d2 fix(packages/compoents/external): 修复拓展组件生产环境无法使用问题
    xp.Huang authored
    2023-04-10 10:02:56 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    97090990
    chore(DefatultRequestContent.vue): 打包时类型错误
    
    See merge request yunteng/thingskit-view!19
    
    (cherry picked from commit 0692e4cd)
    
    d9fe87c6 chore(DefatultRequestContent.vue): 打包时类型错误
    xp.Huang authored
    2023-04-10 10:02:17 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    f801fae1
    chore(types): 修复类型错误
    
    See merge request yunteng/thingskit-view!18
    
    (cherry picked from commit 94722a5c)
    
    49bf1089 chore(types): 修复类型错误
    xp.Huang authored
    2023-04-10 10:01:53 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main_dev' ...
    a1c53226
    feat: 新增动态接口功能, Icon组件
    
    See merge request yunteng/thingskit-view!17
    
    (cherry picked from commit 30398d61)
    
    b3bfc357 feat: 新增动态接口功能, Icon组件
    xp.Huang authored
    2023-04-10 10:01:26 +0800  
    Browse Files »

17 Mar, 2023
4 commits
  • Merge branch 'ww' into 'main' ...
    9d2e5a5a
    fix(preview): 修复更新版本后的预览逻辑
    
    See merge request yunteng/thingskit-view!16
    xp.Huang authored
    2023-03-17 07:11:08 +0000  
    Browse Files »
  • fix(preview): 修复更新版本后的预览逻辑
    e06ff2e7
    ww authored
    2023-03-17 11:31:16 +0800  
    Browse Files »
  • Merge branch 'merge' into 'main' ...
    87d47feb
    update(*): 升级至V1.2.3 / V2.2.0(2023/03/16)版本
    
    See merge request yunteng/thingskit-view!15
    xp.Huang authored
    2023-03-17 03:00:09 +0000  
    Browse Files »
  • update(*): 升级至V1.2.3 / V2.2.0(2023/03/16)版本
    b6d57a96
    ww authored
    2023-03-17 10:59:13 +0800  
    Browse Files »

16 Mar, 2023
1 commit
  • Merge branch 'ww' into 'main' ...
    2316e68a
    fix(token): 修复token过期未调用刷新token接口获取新token
    
    See merge request yunteng/thingskit-view!14
    xp.Huang authored
    2023-03-16 02:03:57 +0000  
    Browse Files »

15 Mar, 2023
4 commits
  • fix(token): 修复token过期未调用刷新token接口获取新token
    4264c440
    ww authored
    2023-03-15 15:44:27 +0800  
    Browse Files »
  • fix(background): 清除背景会默认选择
    1c4ddb0e
    ww authored
    2023-03-15 09:32:48 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main' ...
    073083f3
    feat(external/Componse): 组合新增标题
    
    See merge request yunteng/thingskit-view!13
    xp.Huang authored
    2023-03-15 01:03:37 +0000  
    Browse Files »
  • Merge branch 'ww' into 'main' ...
    68eb97ed
    feat: 新增icon组件,修复背景图问题
    
    See merge request yunteng/thingskit-view!12
    xp.Huang authored
    2023-03-15 01:02:37 +0000  
    Browse Files »

14 Mar, 2023
9 commits
  • feat(external/Componse): 组合新增标题
    715b7a4b
    fengwotao authored
    2023-03-14 18:06:57 +0800  
    Browse Files »
  • fix(request): 请求权限验证失败问题
    f1ea5640
    ww authored
    2023-03-14 18:06:29 +0800  
    Browse Files »
  • perf(icon): 颜色选择器新增清除按钮
    fbd3f411
    ww authored
    2023-03-14 17:33:12 +0800  
    Browse Files »
  • feat(icon): 新增图标组件
    2c754004
    ww authored
    2023-03-14 17:30:18 +0800  
    Browse Files »
  • perf(external/Componse): 移除组合下的词云
    8e47a5c7
    fengwotao authored
    2023-03-14 15:12:38 +0800  
    Browse Files »
  • feat(assets/images/chart/charts): assets目录下的charts目录替换为组合下的图片
    bc0b09fc
    fengwotao authored
    2023-03-14 15:11:26 +0800  
    Browse Files »
  • feat(external/Compose): 组合-更多下新增了按钮和日期时间两个控件
    49f41cf6
    fengwotao authored
    2023-03-14 15:02:02 +0800  
    Browse Files »
  • fix(background): 修复生产环境与开发环境保存的静态资源路径不一致
    bcf448a5
    ww authored
    2023-03-14 09:23:43 +0800  
    Browse Files »
  • Merge branch 'ft' into 'main' ...
    4fe7ee40
    feat(external/Compose): 组合组件新增头部组合1,2,3
    
    See merge request yunteng/thingskit-view!11
    xp.Huang authored
    2023-03-14 01:00:00 +0000  
    Browse Files »

13 Mar, 2023
2 commits
  • feat(external/Compose): 组合新增头部1,2,3
    db7a1485
    fengwotao authored
    2023-03-13 18:05:02 +0800  
    Browse Files »
  • Merge branch 'ww' into 'main' ...
    e00bf501
    fix: 修复类型错误
    
    See merge request yunteng/thingskit-view!10
    xp.Huang authored
    2023-03-13 01:58:48 +0000  
    Browse Files »