Commit Graph

  • a44b57232f fix: 修改tree 100011797 2023-01-13 14:24:52 +0800
  • 6d18f10d2a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-13 14:02:54 +0800
  • 2e26ee726d fix: 修改登录页 blp 2023-01-13 14:02:23 +0800
  • b02d2704f3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-13 13:56:22 +0800
  • 55336d6aa9 feat: 新增物模型组件开发 wangshuaiswim 2023-01-13 13:55:43 +0800
  • fd46e8088b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-13 13:51:31 +0800
  • bafa5ef62b fix: webhook编辑表格优化 JiangQiming 2023-01-13 13:51:15 +0800
  • 91eeb2dadd fix: 修改table卡片插槽样式 100011797 2023-01-13 13:47:28 +0800
  • 91d1d10da5 fix: 设备接入网关 自定义设备接入第三步 jackhoo_98 2023-01-13 13:37:23 +0800
  • 7b53119ad9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-13 11:55:02 +0800
  • badecf9f64 feat: 增加menuStore wangshuaiswim 2023-01-13 11:54:33 +0800
  • 83c75f1ae6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-13 11:49:39 +0800
  • 5323a10c82 fix: 通知配置新增修改接口联调 JiangQiming 2023-01-13 11:49:09 +0800
  • e01ab75de9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-13 11:03:32 +0800
  • 8bd8ad3a39 feat: 新增设备和产品接口,新增productStore,新增utils.ts wangshuaiswim 2023-01-13 11:02:14 +0800
  • 44d6d77b8e fix: 证书管理 文件上传地址常量更改 jackhoo_98 2023-01-13 10:35:55 +0800
  • 6ed95f4758
    Merge pull request #44 from jetlinks/dev-hub 胡彪 2023-01-13 09:57:26 +0800
  • 7c62c8903d Merge remote-tracking branch 'origin/dev' into dev-hub jackhoo_98 2023-01-13 09:54:22 +0800
  • f225993626 fix: 设备接入网关 json转Markdown jackhoo_98 2023-01-13 09:52:56 +0800
  • 3ed04a35ff fix: 修改VERSION_CODE wangshuaiswim 2023-01-13 09:49:16 +0800
  • 5a47580ab7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-13 09:46:31 +0800
  • 0a2056bc0a fix: 修改SystemConst定义 wangshuaiswim 2023-01-13 09:45:52 +0800
  • 5f6aa6ce65 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-01-12 19:17:35 +0800
  • 2094994890 feat: 初始化页面添加接口调试和图片上传 xiongqian 2023-01-12 19:17:14 +0800
  • f6fd6b38ef Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-12 18:31:40 +0800
  • c217d51ab6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-12 18:31:15 +0800
  • 18c6c95ccf Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-12 18:30:25 +0800
  • a9f57ac414 update: 首页样式调整 easy 2023-01-12 18:30:07 +0800
  • b971bda7ac feat: 添加物联卡首页 blp 2023-01-12 18:28:43 +0800
  • 20061fb499 fix: table actions 100011797 2023-01-12 18:23:53 +0800
  • 853331f4b4
    Merge pull request #43 from jetlinks/dev-hub 胡彪 2023-01-12 18:14:36 +0800
  • cc8e9aa77b Merge remote-tracking branch 'origin/dev' into dev-hub jackhoo_98 2023-01-12 18:13:11 +0800
  • ab8636c7fd feat: 设备接入网关 自定义设备接入 二三步部分功能 jackhoo_98 2023-01-12 18:12:52 +0800
  • 0154ca8a32 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-12 18:02:07 +0800
  • 7ee453b706 feat: webhook请求头字段表格 JiangQiming 2023-01-12 18:00:04 +0800
  • bcdf8b7882 fix: 新增设备和产品接口 wangshuaiswim 2023-01-12 17:56:37 +0800
  • a1e00a3734 add: 增加设备和产品typing wangshuaiswim 2023-01-12 17:56:05 +0800
  • 9658a11666 add: 增加instanceStore wangshuaiswim 2023-01-12 17:55:33 +0800
  • 085a2d711a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-12 17:39:45 +0800
  • 6728105539 update: api配置 easy 2023-01-12 17:39:02 +0800
  • 5a8799ffaa
    update: 忽略component.d.ts XieYongHong 2023-01-12 16:56:52 +0800
  • a91b4b6b99 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-12 16:50:37 +0800
  • c05cf5d961 feat: 通知配置详情表单 JiangQiming 2023-01-12 16:48:39 +0800
  • ea151386b9 fix: merge 100011797 2023-01-12 15:32:14 +0800
  • 7451dad544 fix: vue转tsx 100011797 2023-01-12 15:31:20 +0800
  • a8b9108462 update: 修改主题色 xieyonghong 2023-01-12 14:52:48 +0800
  • b69a1721bf Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev blp 2023-01-12 14:42:11 +0800
  • 2ef9df6c04 fix: 登录页样式修改 blp 2023-01-12 14:41:49 +0800
  • bd7ef2131b Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-12 11:46:44 +0800
  • 34459132cf update: 添加axios response泛型处理 xieyonghong 2023-01-12 11:45:59 +0800
  • 48ca21ab3d fix: 修改设备api目录,增加产品api wangshuaiswim 2023-01-12 11:33:59 +0800
  • 3135213a05 fix: 修复commit信息无法校验 xieyonghong 2023-01-12 09:54:56 +0800
  • 0890350cf2 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-12 09:34:31 +0800
  • ce3d168f68 feat: merge components.d.ts xieyonghong 2023-01-12 09:13:05 +0800
  • b0983a1988 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-01-11 18:41:06 +0800
  • 5304559608 feat: 添加初始化页面接口数据 xiongqian 2023-01-11 18:38:33 +0800
  • ec79fa0669 feat: 新增Search组件 xieyonghong 2023-01-11 18:26:30 +0800
  • 7f61e53b75 fix: merge 100011797 2023-01-11 18:24:29 +0800
  • 2d49f87cea feat: 表格选择 100011797 2023-01-11 18:24:07 +0800
  • 011f289262 Merge branch 'dev-hub' into dev jackhoo_98 2023-01-11 18:13:39 +0800
  • 8ac810bfb5 feat: 设备接入网关 接入第一步部分功能 jackhoo_98 2023-01-11 18:12:41 +0800
  • fed499e18c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-11 18:12:21 +0800
  • ffc55b91e0 update: api配置 easy 2023-01-11 18:11:56 +0800
  • 0f7cc7d9ec fix: 单点登录接口联调 JiangQiming 2023-01-11 18:07:10 +0800
  • 2e4d853e1b update: 优化config文件 xieyonghong 2023-01-11 18:04:28 +0800
  • d2a82edbe4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-11 16:39:30 +0800
  • f687ca0fad fix: 单点登录接口 JiangQiming 2023-01-11 16:38:57 +0800
  • 3cfee37765 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-11 16:12:01 +0800
  • e2e12cd5c5 update: 优化FormBuilder组件的验证 xieyonghong 2023-01-11 16:10:58 +0800
  • bf493c3a96 feat: 完善FormBuilder组件 xieyonghong 2023-01-11 16:06:06 +0800
  • 26617fc559 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-11 14:42:21 +0800
  • 2436e8fa0d update: api配置界面 easy 2023-01-11 14:41:16 +0800
  • e3c3e43b31 feat: 表格插槽 100011797 2023-01-11 14:33:17 +0800
  • a703709123 Merge branch 'dev' into dev-hub jackhoo_98 2023-01-11 11:23:19 +0800
  • a4830e4c30 fix: 修复证书新增 表单多层数据校验、文件上传数据双向绑定 jackhoo_98 2023-01-11 10:50:31 +0800
  • aab98f3ddf Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 100011797 2023-01-11 10:20:13 +0800
  • 016650a9e9 fix: merge 100011797 2023-01-11 10:17:14 +0800
  • d682234293 fix: merge 100011797 2023-01-11 10:01:28 +0800
  • 748fac80a7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev xiongqian 2023-01-10 18:31:05 +0800
  • 78e423cc50 feat: 表格按钮 100011797 2023-01-10 18:30:05 +0800
  • c22c195200 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-01-10 18:26:47 +0800
  • c67de84110 首页目录调整+api配置页面 easy 2023-01-10 18:26:17 +0800
  • 73278105e7 feat:添加初始化页面 xiongqian 2023-01-10 18:25:54 +0800
  • aa6b6e7788
    Merge pull request #42 from jetlinks/dev-hub 胡彪 2023-01-10 18:24:51 +0800
  • 0de329a361 Merge branch 'dev' into dev-hub jackhoo_98 2023-01-10 18:23:52 +0800
  • c448f50bf2 feat:证书管理新增 基本功能 jackhoo_98 2023-01-10 18:22:30 +0800
  • bfc98e013b fix: 修改ts类型校验 any类型可索引 jackhoo_98 2023-01-10 18:19:57 +0800
  • 26c84eeab6 fix: yarn.lock不忽略 100011797 2023-01-10 17:06:53 +0800
  • e2696b8d3c
    update: 删除components.d.ts XieYongHong 2023-01-10 17:00:37 +0800
  • 1b2a8f1b79 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-10 16:54:54 +0800
  • 4d83ed9e46 fix: 三方绑定联调 JiangQiming 2023-01-10 16:54:47 +0800
  • b9edb9dc14 add: 新增api/device.ts,设备相关接口 wangshuaiswim 2023-01-10 16:25:39 +0800
  • 6350a8f3b9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev wangshuaiswim 2023-01-10 16:22:36 +0800
  • f801cffc00 fix: 删除菜单和按钮枚举 wangshuaiswim 2023-01-10 16:21:58 +0800
  • c5eb9fddc3 feat: 添加FormBuilder组件 xieyonghong 2023-01-10 16:11:02 +0800
  • 458b4ae3d3 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-01-10 15:58:33 +0800
  • bd81041067 feat: merge xieyonghong 2023-01-10 15:58:05 +0800
  • 387d94494e feat: 添加setup插件以支持setup可以设置name xieyonghong 2023-01-10 15:54:19 +0800
  • 2bd5fb94d9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-01-10 15:34:21 +0800
  • c318d28044 fix: 三方绑定接口联调 JiangQiming 2023-01-10 15:34:13 +0800