Merge pull request #4890 from jumpserver/dev

v4.8.0
Merge pull request #4659 from jumpserver/dev
2025-05-03 13:46:33 +00:00 · 2025-03-20 18:44:31 +08:00 · 2025-02-20 10:20:32 +08:00 · 2025-01-15 14:39:21 +08:00 · 2024-12-19 15:57:44 +08:00 · 2024-11-21 19:01:11 +08:00
1 changed files with 6 additions and 4 deletions
--- a/src/components/Table/TagSearch/index.vue
+++ b/src/components/Table/TagSearch/index.vue
@ -244,10 +244,12 @@ export default {
        delete routeFilter.search
      }
      const asFilterTags = _.cloneDeep(this.filterTags)
-      this.filterTags = {
-        ...asFilterTags,
-        ...routeFilter
-      }
+      setTimeout(() => {
+        this.filterTags = {
+          ...asFilterTags,
+          ...routeFilter
+        }
+      }, 100)
    },
    getValueLabel(key, value) {
      for (const field of this.options) {
Author	SHA1	Message	Date
Bryan	68030d98b2	Merge pull request #4890 from jumpserver/dev v4.8.0	2025-03-20 18:44:31 +08:00
Bryan	a861f77609	Merge pull request #4659 from jumpserver/dev v4.7.0	2025-02-20 10:20:32 +08:00
Bryan	e58ec6057c	Merge pull request #4600 from jumpserver/dev v4.6.0	2025-01-15 14:39:21 +08:00
Bryan	7ab20c5885	Merge pull request #4537 from jumpserver/dev v4.5.0	2024-12-19 15:57:44 +08:00
Bryan	e47ddb5355	Merge pull request #4451 from jumpserver/dev v4.4.0	2024-11-21 19:01:11 +08:00
Bryan	56aa3caa83	Merge pull request #4410 from jumpserver/dev v4.3.0	2024-10-17 14:56:18 +08:00
Bryan	19b1dc0dbc	Merge pull request #4367 from jumpserver/dev merge: from dev to master	2024-09-19 19:36:42 +08:00
Bryan	77ef172a23	Merge pull request #4320 from jumpserver/dev v4.1.0	2024-08-15 21:42:42 +08:00
Bryan	4596887bf1	Merge pull request #4178 from jumpserver/dev v4.0.0	2024-07-03 19:06:07 +08:00
Bryan	0a3dc30c85	Merge pull request #4072 from jumpserver/dev v3.10.11-lts	2024-06-19 16:04:12 +08:00
Bryan	51d24bc8e5	Merge pull request #3941 from jumpserver/dev v3.10.10-lts	2024-05-16 16:05:04 +08:00
Bryan	1b15a4d043	Merge pull request #3871 from jumpserver/dev v3.10.9 (dev to master)	2024-04-22 19:44:33 +08:00
Bryan	7d3f818242	Merge pull request #3864 from jumpserver/v3.10 v3.10.8	2024-04-18 17:58:05 +08:00
Bryan	4e26f18d77	Merge pull request #3862 from jumpserver/dev v3.10.8	2024-04-18 17:17:36 +08:00
Bryan	b22613617a	Revert "build(deps): bump follow-redirects from 1.15.3 to 1.15.4" This reverts commit `e971cbf4a8`.	2024-03-27 16:16:07 +08:00
dependabot[bot]	e971cbf4a8	build(deps): bump follow-redirects from 1.15.3 to 1.15.4 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-03-27 16:11:26 +08:00
wangruidong	4672abae35	fix: 刷新页面根据搜索条件过滤出对应的资源	2024-03-04 19:17:05 +08:00
Bryan	ba36d72602	Merge pull request #3761 from jumpserver/master v3.10.4 (branch-v3.10)	2024-02-29 16:26:13 +08:00
Bryan	4bfbbba4c5	Merge pull request #3760 from jumpserver/dev v3.10.4	2024-02-29 16:15:33 +08:00
Bryan	ea038ce43a	Merge pull request #3697 from jumpserver/master v3.10.2	2024-01-17 13:34:12 +00:00
Bryan	e16b19666c	Merge pull request #3696 from jumpserver/dev v3.10.2	2024-01-17 13:33:22 +00:00
Bryan	c7f5409eb6	Merge pull request #3694 from jumpserver/master v3.10.2	2024-01-17 07:35:33 -04:00
Bryan	fdbd7d2222	Merge pull request #3693 from jumpserver/dev v3.10.2	2024-01-17 07:24:50 -04:00
Bryan	ddbaeeafea	Merge pull request #3668 from jumpserver/master v3.10.1	2023-12-29 11:34:04 +05:00
Bryan	efb0e9dacb	Merge pull request #3665 from jumpserver/dev v3.10.1	2023-12-29 11:14:54 +05:00
huailei	f6f8301ad5	Revert "perf: 账号收集翻译" This reverts commit `9a63ae63d4`.	2023-12-22 15:25:31 +08:00
“huailei000”	9a63ae63d4	perf: 账号收集翻译	2023-12-22 11:31:45 +08:00
Bryan	1e007ccda3	Merge pull request #3642 from jumpserver/dev v3.10	2023-12-21 15:15:52 +05:00
老广	d1d0b06b53	Merge pull request #3546 from jumpserver/dev v3.9.0	2023-11-16 18:25:10 +08:00
Bryan	5fb70d2f24	Merge pull request #3450 from jumpserver/dev v3.8.0	2023-10-19 03:33:53 -05:00
Bryan	b54a95430f	Merge pull request #3404 from jumpserver/dev v3.7.0	2023-09-21 17:04:42 +08:00
Bryan	4d8b4c45af	Merge pull request #3355 from jumpserver/dev v3.6.0	2023-08-17 14:00:33 +05:00
Bryan	a6d642df60	Merge pull request #3283 from jumpserver/dev v3.5.0	2023-07-20 19:04:29 +08:00
Jiangjie.Bai	2e74f1522f	Merge pull request #3222 from jumpserver/dev v3.4.0	2023-06-15 14:51:36 +08:00
Jiangjie.Bai	fe615e0314	Merge pull request #3219 from jumpserver/dev v3.4.0	2023-06-15 14:17:46 +08:00
Jiangjie.Bai	09f734e6fc	Merge pull request #3135 from jumpserver/dev v3.3.0	2023-05-18 19:18:11 +08:00
Jiangjie.Bai	3117046342	Merge pull request #3061 from jumpserver/dev v3.2.0	2023-04-20 18:40:08 +08:00
Bai	b68aecb5cc	fix: 批量更新资产平台help-text	2023-04-20 18:39:22 +08:00
Jiangjie.Bai	1c9b155d97	Merge pull request #3057 from jumpserver/dev v3.2.0	2023-04-20 18:22:46 +08:00
Jiangjie.Bai	75b1be9864	Merge pull request #3019 from jumpserver/dev v3.2.0 rc2	2023-04-14 19:01:37 +08:00
Jiangjie.Bai	615c3c1cf4	Merge pull request #3014 from jumpserver/dev v3.2.0 rc1	2023-04-13 20:02:38 +08:00
Jiangjie.Bai	4d82231af4	Merge pull request #3012 from jumpserver/dev v3.2.0 rc1	2023-04-13 19:22:38 +08:00
“huailei000”	c6cf6571b6	perf: ldap导入用户列表-组织下拉框设置最大宽度	2023-03-16 16:44:36 +08:00
Bai	8ea990d070	fix: 修复创建资产添加账号模版报错问题	2023-03-16 16:44:36 +08:00
“huailei000”	f4a32170d5	perf: message	2023-03-16 16:44:36 +08:00
ibuler	073508675e	perf: 添加默认的信息	2023-03-16 16:44:36 +08:00
Jiangjie.Bai	1d6ca0a93a	Merge pull request #2924 from jumpserver/dev v3.1.0 rc4	2023-03-15 19:46:31 +08:00
Jiangjie.Bai	36aea652d6	Merge pull request #2788 from jumpserver/dev v3.0.0	2023-02-23 20:16:41 +08:00
Jiangjie.Bai	1a42ce90ab	Merge pull request #2760 from jumpserver/dev v3.0.0-rc-latest	2023-02-22 22:21:54 +08:00
Jiangjie.Bai	31a401b55d	Merge pull request #2463 from jumpserver/dev v3.0.0-rc4	2023-01-31 18:55:34 +08:00
Jiangjie.Bai	582a84178d	Merge pull request #2187 from jumpserver/dev v2.28.0	2022-11-17 17:44:19 +08:00
Jiangjie.Bai	9b9f7c936c	Merge pull request #2184 from jumpserver/dev v2.28.0-rc5	2022-11-17 14:18:15 +08:00
Jiangjie.Bai	2a6100957f	Merge pull request #2182 from jumpserver/dev v2.28.0-rc4	2022-11-16 21:08:55 +08:00
Jiangjie.Bai	16606d6a27	Merge pull request #2176 from jumpserver/dev v2.28.0-rc2	2022-11-14 10:01:05 +08:00
Jiangjie.Bai	0a612f50e6	Merge pull request #2164 from jumpserver/dev v2.28.0-rc1	2022-11-10 17:45:47 +08:00
Jiangjie.Bai	fe36fa9390	Merge pull request #2117 from jumpserver/dev v2.27.0-rc4	2022-10-18 21:02:10 +08:00
Jiangjie.Bai	ba109900ec	Merge pull request #2113 from jumpserver/dev v2.27.0-rc3	2022-10-18 11:20:57 +08:00
Jiangjie.Bai	ec7768267f	Merge pull request #2105 from jumpserver/dev v2.27.0-rc2	2022-10-14 11:01:32 +08:00
Jiangjie.Bai	cc58b374ab	Merge pull request #2101 from jumpserver/dev v2.27.0-rc1	2022-10-13 17:44:53 +08:00
Jiangjie.Bai	04ffbb8fd6	Merge pull request #2097 from jumpserver/dev v2.27.0-rc1	2022-10-13 15:14:40 +08:00
Jiangjie.Bai	49880f6739	Merge pull request #2059 from jumpserver/dev v2.26.0	2022-09-15 17:49:44 +08:00
Jiangjie.Bai	e6f98d58c4	Merge pull request #2057 from jumpserver/dev v2.26.0-rc4	2022-09-15 16:18:03 +08:00
Jiangjie.Bai	fd1f16d43c	Merge pull request #2050 from jumpserver/dev v2.26.0-rc2	2022-09-13 17:41:39 +08:00
Jiangjie.Bai	968b2415b1	Merge pull request #2043 from jumpserver/dev v2.26.0-rc1	2022-09-08 15:46:44 +08:00
Jiangjie.Bai	776090d6ba	Merge pull request #2001 from jumpserver/dev v2.25.0	2022-08-18 16:12:45 +08:00
Jiangjie.Bai	3a37952288	Merge pull request #1996 from jumpserver/dev v2.25.0-rc4	2022-08-17 16:53:23 +08:00
Jiangjie.Bai	62b8fc0e3b	Merge pull request #1994 from jumpserver/dev v2.25.0-rc3	2022-08-16 19:08:23 +08:00
Jiangjie.Bai	b2028869cb	Merge pull request #1986 from jumpserver/dev v2.25.0-rc2	2022-08-12 18:06:56 +08:00
Jiangjie.Bai	5277a725f8	Merge pull request #1973 from jumpserver/dev v2.25.0-rc1	2022-08-11 14:11:59 +08:00
Jiangjie.Bai	f137788c1a	Merge pull request #1957 from jumpserver/dev v2.24.0-rc5	2022-07-20 19:06:03 +08:00
Jiangjie.Bai	f7d17c8de7	Merge pull request #1954 from jumpserver/dev v2.24.0-rc4	2022-07-19 16:18:13 +08:00
Jiangjie.Bai	feea70b0be	Merge pull request #1944 from jumpserver/dev v2.24.0-rc3	2022-07-18 12:05:42 +08:00
Jiangjie.Bai	04696ef3d6	Merge pull request #1940 from jumpserver/dev v2.24.0-rc2	2022-07-15 18:07:37 +08:00
Jiangjie.Bai	1731f4f788	Merge pull request #1934 from jumpserver/dev v2.24.0-rc1	2022-07-14 18:27:51 +08:00
Jiangjie.Bai	6f25d93909	Merge pull request #1931 from jumpserver/dev v2.24.0-rc1	2022-07-14 17:51:58 +08:00
Jiangjie.Bai	46461ec324	Merge pull request #1925 from jumpserver/dev v2.24.0-rc1	2022-07-14 15:12:15 +08:00