diff --git a/src/pages/bk.config.js b/src/pages/bk.config.js
index 1634415dd..4c1a45cdf 100644
--- a/src/pages/bk.config.js
+++ b/src/pages/bk.config.js
@@ -9,20 +9,20 @@ module.exports = {
open: true,
replaceStatic: true,
outputAssetsDirName: '',
+ https: true,
// webpack config 配置
configureWebpack() {
return {
devServer: {
setupMiddlewares: mockServer,
- https: true,
- proxy: {
+ proxy: [{
'/api': {
target: process.env.BK_AJAX_BASE_URL,
changeOrigin: true,
secure: false,
},
- },
+ }],
client: {
overlay: false,
},
diff --git a/src/pages/package.json b/src/pages/package.json
index 7255a45d9..b858b2899 100644
--- a/src/pages/package.json
+++ b/src/pages/package.json
@@ -53,10 +53,10 @@
"vue-router": "^4.1.6"
},
"devDependencies": {
- "@blueking/babel-preset-bk": "^2.1.0-beta7",
- "@blueking/cli-service-webpack": "0.0.0-beta.109",
- "@blueking/eslint-config-bk": "2.1.0-beta.12",
- "@blueking/stylelint-config-bk": "^2.1.0-beta.9",
+ "@blueking/babel-preset-bk": "^2.1.0-beta.11",
+ "@blueking/cli-service-webpack": "^0.0.1",
+ "@blueking/eslint-config-bk": "^2.1.0-beta.22",
+ "@blueking/stylelint-config-bk": "^2.1.0-beta.10",
"@types/node": "^20.5.1",
"enhanced-resolve": "^5.10.0",
"eslint-plugin-import": "^2.28.1",
diff --git a/src/pages/src/components/layouts/MainBreadcrumbs.vue b/src/pages/src/components/layouts/MainBreadcrumbs.vue
index bea78e23b..00c00409c 100644
--- a/src/pages/src/components/layouts/MainBreadcrumbs.vue
+++ b/src/pages/src/components/layouts/MainBreadcrumbs.vue
@@ -1,5 +1,5 @@
-
+
store.breadCrumbsTitle || route.meta.navName);
* back control
*/
const showBack = computed(() => route.meta.showBack);
+
+const hiddenBoxShadow = computed(() => route.meta.hiddenBoxShadow);
+
const handleBack = () => {
const { back } = window.history.state;
if (back) {
@@ -75,4 +78,8 @@ const handleBack = () => {
margin-right: 4px;
}
}
+
+ .hidden-box-shadow {
+ box-shadow: none !important;
+ }
diff --git a/src/pages/src/components/layouts/MainView.vue b/src/pages/src/components/layouts/MainView.vue
index 7fa5dda16..cbde19237 100644
--- a/src/pages/src/components/layouts/MainView.vue
+++ b/src/pages/src/components/layouts/MainView.vue
@@ -14,7 +14,9 @@
class="main-container__view user-scroll-y user-scroll-x"
:class="[{
'pd-24': mainViewStore.hasPadding,
- 'has-breadcrumbs': !mainViewStore.customBreadcrumbs
+ 'has-breadcrumbs': !mainViewStore.customBreadcrumbs,
+ 'has-alert': userStore.showAlert,
+ 'overflow-hidden': hiddenBoxShadow,
}]">
@@ -23,18 +25,22 @@
-
diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index 703d81ff7..622cd939f 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -1,15 +1,20 @@
+
+
+
-
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/OperationDetails.vue b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue
similarity index 84%
rename from src/pages/src/views/setting/cross-tenant-collaboration/OperationDetails.vue
rename to src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue
index 322f4b8f7..12bd71d32 100644
--- a/src/pages/src/views/setting/cross-tenant-collaboration/OperationDetails.vue
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/my-share/OperationDetails.vue
@@ -12,22 +12,8 @@
-
-
-
@@ -52,8 +38,8 @@
v-model="formData.sync_type"
>
{{ $t('所有字段') }}
- {{ $t('指定字段') }}
- {{ $t('仅基础字段') }}
+
+
+
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue
new file mode 100644
index 000000000..bb6f9c3ea
--- /dev/null
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/OperationDetails.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
diff --git a/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue
new file mode 100644
index 000000000..b4414b0bc
--- /dev/null
+++ b/src/pages/src/views/setting/cross-tenant-collaboration/other-share/index.vue
@@ -0,0 +1,489 @@
+
+
+
+
+
+
+
diff --git a/src/pages/src/views/setting/data-source/ConfigList.vue b/src/pages/src/views/setting/data-source/ConfigList.vue
index e976c6728..61c1d56ff 100644
--- a/src/pages/src/views/setting/data-source/ConfigList.vue
+++ b/src/pages/src/views/setting/data-source/ConfigList.vue
@@ -18,7 +18,10 @@
-
+
-
+
当前还没有数据源,需要先选择数据源类型并进行配置
@@ -170,8 +173,7 @@
-