Merge branch 'develop' into sync/hosted

* develop: chore: add change log (#1562) sync: hosted cloud (#1561) # Conflicts: # CHANGELOG.md # backend-server/application/src/main/java/com/apitable/organization/service/impl/MemberServiceImpl.java # backend-server/application/src/main/resources/sysconfig/strings.json # backend-server/gradle/libs.versions.toml # packages/core/src/config/stringkeys.interface.ts # packages/datasheet/public/file/langs/strings.json # packages/datasheet/public/file/langs/strings.zh-CN.json # packages/datasheet/src/global.less # packages/datasheet/src/modules/api/node/api.ts # packages/datasheet/src/pc/components/catalog/node_context_menu/node_context_menu.tsx # packages/datasheet/src/pc/components/common/color_picker/color_group.tsx # packages/datasheet/src/pc/components/editors/button_editor/buton_item/index.tsx # packages/datasheet/src/pc/components/embed_page/components/setting/setting.tsx # packages/datasheet/src/pc/components/embed_page/components/setting/setting_inner.tsx # packages/datasheet/src/pc/components/embed_page/components/tab/tab.tsx # packages/datasheet/src/pc/components/embed_page/config/config.ts # packages/datasheet/src/pc/components/embed_page/embed_page.tsx # packages/datasheet/src/pc/components/embed_page/hooks/use_get_desc.ts # packages/datasheet/src/pc/components/embed_page/hooks/use_get_info.ts # packages/datasheet/src/pc/components/gantt_view/style.module.less # packages/datasheet/src/pc/components/konva_grid/style.module.less # packages/datasheet/src/pc/components/route_manager/workspace_route.tsx # packages/datasheet/src/pc/components/tab_bar/description_modal/description_modal.tsx # packages/datasheet/src/widget-stage/main/main.less # packages/datasheet/tailwind.config.js # packages/i18n-lang/src/config/strings.json # packages/i18n-lang/src/config/strings.zh-CN.json # packages/l10n/base/strings.en-US.json # packages/l10n/base/strings.zh-CN.json
apitable · Jan 15, 2024 · d0e82b1 · d0e82b1
2 parents c4f6cd4 + 64fb41c
commit d0e82b1
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # APITable CHANGELOG
 
+## [v1.8.0-beta.1](https://github.com/apitable/apitable/releases/tag/v1.8.0-beta.1) (2024-01-08)
+
+
+### What's more
+
+* sync: hosted cloud ([#1561](https://github.com/apitable/apitable/pull/1561)) @robot518 
 ## [v1.8.0-beta](https://github.com/apitable/apitable/releases/tag/v1.8.0-beta) (2024-01-02)
 
 ### Bug fixes

diff --git a/backend-server/application/src/test/java/com/apitable/AbstractIntegrationTest.java b/backend-server/application/src/test/java/com/apitable/AbstractIntegrationTest.java
@@ -82,6 +82,7 @@
 import com.apitable.workspace.service.IResourceMetaService;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import jakarta.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

diff --git a/packages/core/src/commands_actions/datasheet.ts b/packages/core/src/commands_actions/datasheet.ts
@@ -851,7 +851,7 @@ export class DatasheetActions {
       recordIds: string[];
       getFieldByFieldId(fieldId: string): IField;
       state: IReduxState;
-    },
+    }
   ): IJOTAction[] {
     const recordMap = snapshot.recordMap;
     const recordSize = Object.keys(recordMap).length;

diff --git a/packages/datasheet/package.json b/packages/datasheet/package.json
@@ -327,4 +327,4 @@
       ]
     ]
   }
-}
+}
diff --git a/packages/datasheet/src/pc/styles/lib_mixins.less b/packages/datasheet/src/pc/styles/lib_mixins.less
@@ -809,3 +809,41 @@
 .px2vw(@px) {
   @res: @px / @view-width * 100vw;
 }
+
+//unite scroll bar style
+.scroll-bar(@size:auto;) {
+  &::-webkit-scrollbar {
+    background: transparent;
+    width: @size !important;
+    height: @size !important;
+  }
+}
+
+.scroll-bar-thumb(@radius:7px; @border:4px;@background:0) {
+  &::-webkit-scrollbar-thumb {
+    background-color: transparent;
+    background: if((@background = 0), transparent, var(--bgScrollbarDefault));
+    background-clip: padding-box;
+    min-height: 36px;
+    border-radius: @radius;
+    border: @border solid transparent;
+  }
+  &:hover::-webkit-scrollbar-thumb {
+    background-color: var(--bgScrollbarDefault);
+  }
+}
+
+.scroll-bar-default {
+  .scroll-bar(14px);
+  .scroll-bar-thumb(7px,4px);
+}
+
+.scroll-bar-small {
+  .scroll-bar(8px);
+  .scroll-bar-thumb(4px,2px);
+}
+
+.scroll-bar-large(@showBackground:0) {
+  .scroll-bar(18px);
+  .scroll-bar-thumb(10px,4px,@showBackground);
+}