Sign in

简柏林 / thingskit-front · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 4,552
  • Network
  • Compare
  • Branches 9
  • Tags 0
  • thingskit-front
17 Nov, 2023
5 commits
  • Merge branch 'fix/DEFECT-1759' into 'main_dev' ...
    5d1e3cc1
    fix: 产品分类字段换成产品品类
    
    See merge request yunteng/thingskit-front!1014
    xp.Huang authored
    2023-11-17 03:42:23 +0000  
    Browse Files »
  • fix: 产品分类字段换成产品品类
    0e74415e
    loveumiko authored
    2023-11-17 11:29:06 +0800  
    Browse Files »
  • Merge branch 'local_dev_branch_by_ft' into 'main_dev' ...
    3ca746d2
    fix: DEFECT-1758 首先点击新增公共接口,选择websocket请求,然后点击管理页回到界面,再新增公共接口,此时普通请求没有请求类型了
    
    See merge request yunteng/thingskit-front!1012
    xp.Huang authored
    2023-11-17 03:02:56 +0000  
    Browse Files »
  • fix: DEFECT-1758 首先点击新增公共接口,选择websocket请求,然后点击管理页回到界面,再新增公共接口,此时普通请求没有请求类型了
    43b6c208
    fengtao authored
    2023-11-17 03:02:56 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1754' into 'main_dev' ...
    02bcfcf6
    fix: 修复TCP网关子产品新增后,选择了默认脚本,然后编辑时,提示请选择对应脚本
    
    See merge request yunteng/thingskit-front!1011
    xp.Huang authored
    2023-11-17 01:08:37 +0000  
    Browse Files »

16 Nov, 2023
2 commits
  • fix: 修复TCP网关子产品新增后,选择了默认脚本,然后编辑时,提示请选择对应脚本
    3332f053
    loveumiko authored
    2023-11-16 16:35:11 +0800  
    Browse Files »
  • Merge branch 'fix/DEFECT-1753' into 'main_dev' ...
    875167ba
    fix: 修复编辑产品品类成功后,没有提示框和产品品类删除报错
    
    See merge request yunteng/thingskit-front!1010
    xp.Huang authored
    2023-11-16 01:29:06 +0000  
    Browse Files »

15 Nov, 2023
13 commits
  • fix: 修复产品编辑和新增产品品类禁用的问题
    ce98d2ab
    loveumiko authored
    2023-11-15 17:50:31 +0800  
    Browse Files »
  • fix: 修改svg引入
    9459700a
    loveumiko authored
    2023-11-15 17:20:43 +0800  
    Browse Files »
  • fix: 修复编辑产品品类成功后,没有提示框和产品品类删除报错
    b06803d1
    loveumiko authored
    2023-11-15 17:16:12 +0800  
    Browse Files »
  • Merge branch 'fix/category' into 'main_dev' ...
    4a17f35a
    fix:编辑产品时产品品类改为不能编辑
    
    See merge request yunteng/thingskit-front!1009
    xp.Huang authored
    2023-11-15 08:20:19 +0000  
    Browse Files »
  • fix: 编辑产品时产品品类改为不能编辑
    516da331
    loveumiko authored
    2023-11-15 15:53:32 +0800  
    Browse Files »
  • Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into fix/category
    53534a10
    loveumiko authored
    2023-11-15 15:51:07 +0800  
    Browse Files »
  • fix: 编辑产品时产品品类改为不能编辑
    10ecd1a6
    loveumiko authored
    2023-11-15 15:49:45 +0800  
    Browse Files »
  • Merge branch 'fix/category' into 'main_dev' ...
    d27d3dae
    fix: 修改产品品类删除权限问题
    
    See merge request yunteng/thingskit-front!1008
    xp.Huang authored
    2023-11-15 07:13:30 +0000  
    Browse Files »
  • fix: 修改产品品类删除权限问题
    327fcdef
    loveumiko authored
    2023-11-15 14:42:57 +0800  
    Browse Files »
  • Merge branch 'fix/category' into 'main_dev' ...
    993ab44e
    fix: 修复产品品类导入svg引入
    
    See merge request yunteng/thingskit-front!1007
    xp.Huang authored
    2023-11-15 06:24:39 +0000  
    Browse Files »
  • fix: 修复产品品类导入svg引入
    dfdd0114
    loveumiko authored
    2023-11-15 14:20:38 +0800  
    Browse Files »
  • Merge branch 'feat/category' into 'main_dev' ...
    902a7bcb
    feat: 产品添加产品品类相关
    
    See merge request yunteng/thingskit-front!995
    xp.Huang authored
    2023-11-15 04:01:31 +0000  
    Browse Files »
  • feat: 产品添加产品品类相关
    95ca839d
    张 峰林 authored
    2023-11-15 04:01:31 +0000  
    Browse Files »

14 Nov, 2023
4 commits
  • Merge branch 'fix/DEFECT-1748' into 'main_dev' ...
    04568e8f
    fix: 修复场景联动选择框上下移动时会跟随移动,固定位置
    
    See merge request yunteng/thingskit-front!1003
    xp.Huang authored
    2023-11-14 07:18:29 +0000  
    Browse Files »
  • Merge branch 'fix/DEFECT-1743' into 'main_dev' ...
    96e35f38
    fix: 修复看板组件编辑,复制等提示去掉后面符号
    
    See merge request yunteng/thingskit-front!1002
    xp.Huang authored
    2023-11-14 07:14:13 +0000  
    Browse Files »
  • revert: 场景联动查询时间
    8748a0eb
    xp.Huang authored
    2023-11-14 10:24:27 +0800  
    Browse Files »
  • fix: 修复场景联动选择框上下移动时会跟随移动,固定位置
    f6c9e1e2
    loveumiko authored
    2023-11-14 09:52:47 +0800  
    Browse Files »

13 Nov, 2023
7 commits
  • Merge branch 'perf/linkedage-enable-rule' into 'main_dev' ...
    831bd1ad
    Perf/linkedage enable rule
    
    See merge request yunteng/thingskit-front!1001
    xp.Huang authored
    2023-11-13 09:02:04 +0000  
    Browse Files »
  • fix: 修复看板组件编辑,复制等提示去掉后面符号
    72c28a55
    loveumiko authored
    2023-11-13 16:57:31 +0800  
    Browse Files »
  • fix: 修复启用规则开始时间能大于结束时间
    2a662c47
    ww authored
    2023-11-13 16:57:25 +0800  
    Browse Files »
  • Merge branch 'local_fix_report_config_by_ft' into 'main_dev' ...
    4b86efb5
    fix: 修复报表导出,报表查看,日期取值问题
    
    See merge request yunteng/thingskit-front!1000
    xp.Huang authored
    2023-11-13 03:50:46 +0000  
    Browse Files »
  • fix: 修复报表导出,报表查看,日期取值问题
    9641390f
    fengwotao authored
    2023-11-13 11:48:19 +0800  
    Browse Files »
  • Merge branch 'fix/report-config' into 'main_dev' ...
    03ccb74b
    fix: 修复报表配置数据类型为原始数据时存在时间间隔字段
    
    See merge request yunteng/thingskit-front!999
    xp.Huang authored
    2023-11-13 00:50:09 +0000  
    Browse Files »
  • Merge branch 'fix/linkedge' into 'main_dev' ...
    ebafc985
    fix: 修复场景联动启用规则在查看模式下能打开其他规则
    
    See merge request yunteng/thingskit-front!998
    xp.Huang authored
    2023-11-13 00:49:59 +0000  
    Browse Files »

10 Nov, 2023
8 commits
  • fix: 修复报表配置数据类型为原始数据时存在时间间隔字段
    53818391
    ww authored
    2023-11-10 11:37:30 +0800  
    Browse Files »
  • fix: 修复场景联动启用规则在查看模式下能打开其他规则
    c09465de
    ww authored
    2023-11-10 10:52:08 +0800  
    Browse Files »
  • Merge branch 'perf/linkedage-enable-ruleB' into 'main_dev' ...
    7cbcfb69
    perf: 优化时间选择
    
    See merge request yunteng/thingskit-front!997
    xp.Huang authored
    2023-11-10 02:22:46 +0000  
    Browse Files »
  • perf: 优化时间选择
    b96ff940
    ww authored
    2023-11-10 10:08:27 +0800  
    Browse Files »
  • Merge branch 'perf/linkedge' into 'main_dev' ...
    8f68d27e
    perf: 优化场景联动条件筛选按钮名称
    
    See merge request yunteng/thingskit-front!996
    xp.Huang authored
    2023-11-10 01:21:33 +0000  
    Browse Files »
  • perf: 优化场景联动条件筛选按钮名称
    c722b968
    ww authored
    2023-11-10 09:13:56 +0800  
    Browse Files »
  • Merge branch 'fix/rule-chain-show-detail-mode' into 'main_dev' ...
    611cecc5
    fix: 修复场景联动查看详情时无法打开启用规则
    
    See merge request yunteng/thingskit-front!993
    xp.Huang authored
    2023-11-10 01:11:13 +0000  
    Browse Files »
  • Merge branch 'fix/rule-chain' into 'main_dev' ...
    d6525211
    fix: 修复规则链设备配置无法选择状态
    
    See merge request yunteng/thingskit-front!992
    xp.Huang authored
    2023-11-10 01:11:03 +0000  
    Browse Files »

09 Nov, 2023
1 commit
  • fix: 修复规则链查看详情时无法打开启用规则
    a77e24ac
    ww authored
    2023-11-09 16:02:49 +0800  
    Browse Files »