From 6b8ec8a5fe39a66ebc4a32577000d73372f12d0e Mon Sep 17 00:00:00 2001
From: leafage-collb <3303710797@qq.com>
Date: Wed, 13 Mar 2024 10:19:50 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?-=E5=8D=A1=E7=89=87=E5=9F=BA=E7=A1=80=E9=98=B4=E5=BD=B1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webfe/package_vue/src/assets/css/ps-style.scss               | 5 +++++
 .../src/views/dev-center/app/basic-config/info.vue           | 2 +-
 .../src/views/dev-center/app/basic-config/members.vue        | 2 +-
 .../src/views/dev-center/app/market/market-info.vue          | 4 ++--
 .../src/views/dev-center/app/market/mobile-market.vue        | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webfe/package_vue/src/assets/css/ps-style.scss b/webfe/package_vue/src/assets/css/ps-style.scss
index f9e58a4244..16b07ec60e 100644
--- a/webfe/package_vue/src/assets/css/ps-style.scss
+++ b/webfe/package_vue/src/assets/css/ps-style.scss
@@ -1157,3 +1157,8 @@ span.ellipsis {
         margin-left: 10px;
     }
 }
+
+.shadow-card-style {
+    box-shadow: 0 2px 4px 0 #1919290d;
+    border-radius: 2px;
+}
diff --git a/webfe/package_vue/src/views/dev-center/app/basic-config/info.vue b/webfe/package_vue/src/views/dev-center/app/basic-config/info.vue
index 7ee8446601..667761569f 100644
--- a/webfe/package_vue/src/views/dev-center/app/basic-config/info.vue
+++ b/webfe/package_vue/src/views/dev-center/app/basic-config/info.vue
@@ -1,7 +1,7 @@
 <template lang="html">
   <div class="right-main">
     <paas-content-loader
-      class="app-container middle base-info-container"
+      class="app-container middle base-info-container shadow-card-style"
       :is-loading="isLoading"
       placeholder="base-info-loading"
     >
diff --git a/webfe/package_vue/src/views/dev-center/app/basic-config/members.vue b/webfe/package_vue/src/views/dev-center/app/basic-config/members.vue
index b37d77c55b..b587710aac 100644
--- a/webfe/package_vue/src/views/dev-center/app/basic-config/members.vue
+++ b/webfe/package_vue/src/views/dev-center/app/basic-config/members.vue
@@ -2,7 +2,7 @@
   <div class="right-main">
 
     <paas-content-loader
-      class="app-container middle role-container"
+      class="app-container middle role-container shadow-card-style"
       :is-loading="loading"
       placeholder="roles-loading"
     >
diff --git a/webfe/package_vue/src/views/dev-center/app/market/market-info.vue b/webfe/package_vue/src/views/dev-center/app/market/market-info.vue
index a28cdaaee3..b737fe2f8d 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/market-info.vue
+++ b/webfe/package_vue/src/views/dev-center/app/market/market-info.vue
@@ -1,6 +1,6 @@
 <template>
   <section v-show="!isDataLoading">
-    <div class="ps-action-header mark-info">
+    <div class="ps-action-header mark-info shadow-card-style">
       <div class="release-info flex-row align-items-center">
         <strong class="release-info-title">{{ $t('发布状态') }}</strong>
         <div class="release-info-status">{{ appMarketConfig.enabled ? $t('已发布') : $t('未发布') }}</div>
@@ -60,7 +60,7 @@
     <template v-if="engineAbled">
       <div
         v-if="!confirmRequiredWhenPublish || isSureRisk || appMarketConfig.enabled"
-        class="address-info mt15 flex-row align-items-center">
+        class="address-info mt15 flex-row align-items-center shadow-card-style">
         <strong class="address-info-title">{{ $t('访问地址') }}</strong>
         <!-- 编辑态 -->
         <div class="address-info-url" v-if="isEditAddress">
diff --git a/webfe/package_vue/src/views/dev-center/app/market/mobile-market.vue b/webfe/package_vue/src/views/dev-center/app/market/mobile-market.vue
index 31cede8db2..c9e7b015e5 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/mobile-market.vue
+++ b/webfe/package_vue/src/views/dev-center/app/market/mobile-market.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="right-main">
     <paas-content-loader
-      class="app-container middle mobile-market-container"
+      class="app-container middle mobile-market-container shadow-card-style"
       :is-loading="isDataLoading"
       placeholder="market-mobile-loading"
     >

From 6c7ad7b45f7fba2f7b798807026c6ceb8f364349 Mon Sep 17 00:00:00 2001
From: leafage-collb <3303710797@qq.com>
Date: Wed, 13 Mar 2024 10:23:36 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix=EF=BC=9AS-mart=20=E5=BA=94=E7=94=A8-=20?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=B8=82=E5=9C=BA=E4=BF=A1=E6=81=AF=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dev-center/app/market/index.scss    |  8 ++++++++
 .../dev-center/app/market/market-manager.vue  | 20 +++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/webfe/package_vue/src/views/dev-center/app/market/index.scss b/webfe/package_vue/src/views/dev-center/app/market/index.scss
index 96a7f72097..1a29fe67b4 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/index.scss
+++ b/webfe/package_vue/src/views/dev-center/app/market/index.scss
@@ -3,6 +3,14 @@
     width: 200px;
 }
 
+.market-info-title-wrapper {
+    span {
+        font-size: 12px;
+        color: #979ba5;
+        margin-left: 18px;
+    }
+}
+
 .logo-uploader {
     padding: 18px 0 24px 16px;
 
diff --git a/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue b/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue
index 08eb45e953..b5fbf2837b 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue
+++ b/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue
@@ -4,17 +4,14 @@
     placeholder="market-visit-loading"
   >
     <section v-show="!isDataLoading" class="market-manager">
-      <div
-        v-if="isSmartApp"
-        class="info mb10 mt10"
-      >
-        {{ $t('应用市场信息请在“app_desc.yaml”文件中配置') }}
-      </div>
-      <div class="market-info mb25">
+      <div class="market-info mb25 shadow-card-style">
         <div class="flex-row justify-content-between align-items-center">
-          <strong class="market-info-title"> {{ $t('市场信息') }} </strong>
+          <div class="market-info-title-wrapper">
+            <strong class="market-info-title"> {{ $t('市场信息') }} </strong>
+            <span v-if="isSmartApp">{{ $t('应用市场信息请在“app_desc.yaml”文件中配置') }}</span>
+          </div>
           <bk-button
-            v-if="isSaveMarketInfo"
+            v-if="isSaveMarketInfo && !isSmartApp"
             theme="primary"
             outline
             class="mr10  market-info-btn"
@@ -663,6 +660,10 @@ export default {
         this.baseInfo.updated = application.updated;
         this.baseInfo.region_name = application.region_name;
         this.isSaveMarketInfo = res.product;
+        // S-mart 应用只有查看态
+        if (this.isSmartApp) {
+          this.isSaveMarketInfo = true;
+        }
         // 通过product判断应用是否已经保存过
         if (res.product) {
           // 已注册用户判断是否在生产环境发布部署
@@ -712,7 +713,6 @@ export default {
             this.baseInfo.logo = application.logo_url;
           }
         }
-        console.log('this.baseInfo', this.baseInfo);
         if (!product) {
           this.changeNewtab();
         }

From 417044dc242b36391e3281b0351db30b2cdc3945 Mon Sep 17 00:00:00 2001
From: leafage-collb <3303710797@qq.com>
Date: Wed, 13 Mar 2024 11:06:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9AS-mart=20=E5=BA=94=E7=94=A8=E6=96=B0=E5=BB=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package_vue/src/components/paas-module-bar.vue  | 13 +++++++++----
 webfe/package_vue/src/language/lang/en.js           |  1 +
 webfe/package_vue/src/language/lang/zh.js           |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/webfe/package_vue/src/components/paas-module-bar.vue b/webfe/package_vue/src/components/paas-module-bar.vue
index d799be1f65..c8126cb27f 100644
--- a/webfe/package_vue/src/components/paas-module-bar.vue
+++ b/webfe/package_vue/src/components/paas-module-bar.vue
@@ -20,7 +20,7 @@
       <div class="module-operate">
         <!-- 新增模块 -->
         <div
-          v-bk-tooltips="{ content: $t('当前应用不允许创建其他模块'), disabled: isCreatedModule }"
+          v-bk-tooltips="{ content: $t(disableTips), disabled: isCreatedModule }"
           class="icon-warapper mr8"
           :class="{ disabled: !isCreatedModule }"
           :title="$t('新增模块')"
@@ -54,7 +54,7 @@
         type="error"
         :title="$t('主模块不能删除，删除操作无法撤回，请在删除前与应用其他成员沟通')"
       ></bk-alert>
-      <span v-bk-tooltips="{ content: $t('当前应用不允许创建其他模块'), disabled: isCreatedModule }">
+      <span v-bk-tooltips="{ content: $t(disableTips), disabled: isCreatedModule }">
         <bk-button
           theme="primary"
           :disabled="!isCreatedModule"
@@ -186,7 +186,7 @@ export default defineComponent({
       visiable: false,
       isLoading: false,
     });
-    const { curAppInfo } = store.state;
+    const { curAppInfo, curAppModule } = store.state;
 
     bus.$on('cloud-change-module', (data) => {
       active.value = data.params.moduleId;
@@ -203,6 +203,11 @@ export default defineComponent({
     // 是否展示新建模块入口
     const isCreatedModule = computed(() => curAppInfo.application?.config_info?.can_create_extra_modules);
 
+    const isSmartApp = computed(() => curAppModule.source_origin === vm.proxy.GLOBAL.APP_TYPES.SMART_APP);
+
+    // 新建模块禁用提示
+    const disableTips = computed(() => (isSmartApp.value ? 'S-mart 应用不允许在页面上新建模块' : '当前应用不允许创建其他模块'));
+
     // 切换tab
     const handleTabChange = async () => {
       const curModule = (props.moduleList || []).find(e => e.name === active.value);
@@ -260,7 +265,6 @@ export default defineComponent({
           appCode: props.appCode,
           moduleName: curAppModuleName.value,
         });
-        console.log('vue', vm);
         bkMessage({
           theme: 'success',
           message: '模块删除成功',
@@ -309,6 +313,7 @@ export default defineComponent({
       formRemoveConfirmCode,
       localLanguage,
       isCreatedModule,
+      disableTips,
     };
   },
 });
diff --git a/webfe/package_vue/src/language/lang/en.js b/webfe/package_vue/src/language/lang/en.js
index a68b76bc8b..e9c5804103 100644
--- a/webfe/package_vue/src/language/lang/en.js
+++ b/webfe/package_vue/src/language/lang/en.js
@@ -2455,6 +2455,7 @@ export default {
   无权限: 'No permissions',
   已申请: 'Applied',
   当前应用不允许创建其他模块: 'The current application does not allow the creation of other modules.',
+  'S-mart 应用不允许在页面上新建模块': 'S-mart applications do not allow creating new modules on the page',
   '格式不正确，只能包含：汉字、英文字母、数字、连字符(-)，长度小于 20 个字符': 'The format is incorrect and can only contain: Chinese characters, English letters, numbers, hyphens (-), and the length is less than 20 characters',
   不能选择已发布过的代码分支: 'Cannot select a code branch that has already been released',
   '插件上架后，可在插件市场重新查看该插件的信息': 'After the plug-in is put on the shelves, you can re-check the plug-in information in the plug-in market',
diff --git a/webfe/package_vue/src/language/lang/zh.js b/webfe/package_vue/src/language/lang/zh.js
index 8b016a8214..6a26a395d9 100644
--- a/webfe/package_vue/src/language/lang/zh.js
+++ b/webfe/package_vue/src/language/lang/zh.js
@@ -2598,6 +2598,7 @@ export default {
   无权限: '无权限',
   已申请: '已申请',
   当前应用不允许创建其他模块: '当前应用不允许创建其他模块',
+  'S-mart 应用不允许在页面上新建模块': 'S-mart 应用不允许在页面上新建模块',
   '格式不正确，只能包含：汉字、英文字母、数字、连字符(-)，长度小于 20 个字符': '格式不正确，只能包含：汉字、英文字母、数字、连字符(-)，长度小于 20 个字符',
   不能选择已发布过的代码分支: '不能选择已发布过的代码分支',
   '插件上架后，可在插件市场重新查看该插件的信息': '插件上架后，可在插件市场重新查看该插件的信息',

From 19953a90ce71fc9339fff3a47c3f9ceb2806ab6e Mon Sep 17 00:00:00 2001
From: leafage-collb <3303710797@qq.com>
Date: Wed, 13 Mar 2024 11:45:10 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20S-mart=20=E5=BA=94=E7=94=A8-?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE-=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=9A=E4=B8=8D=E5=85=81=E8=AE=B8=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E3=80=81=E5=81=9C=E7=94=A8=C2=A0=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webfe/package_vue/src/language/lang/en.js     |  2 ++
 webfe/package_vue/src/language/lang/zh.js     |  2 ++
 .../engine/cloud-deployment/app-services.vue  | 23 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/webfe/package_vue/src/language/lang/en.js b/webfe/package_vue/src/language/lang/en.js
index e9c5804103..19d777dec0 100644
--- a/webfe/package_vue/src/language/lang/en.js
+++ b/webfe/package_vue/src/language/lang/en.js
@@ -2539,4 +2539,6 @@ export default {
   去发布: 'To Release',
   我发起的测试: 'My Initiated Tests',
   '代码分支/代码 Commit/创建人/测试进度': 'Code Branch/Code Commit/Creator/Test Progress',
+  'S-mart 应用请在配置文件中设置并开启增强服务': 'For S-mart applications, please set and enable enhanced services in the configuration file',
+  'S-mart 应用暂不支持删除增强服务': 'S-mart applications do not support the deletion of enhanced services for now',
 };
diff --git a/webfe/package_vue/src/language/lang/zh.js b/webfe/package_vue/src/language/lang/zh.js
index 6a26a395d9..758c98ecdd 100644
--- a/webfe/package_vue/src/language/lang/zh.js
+++ b/webfe/package_vue/src/language/lang/zh.js
@@ -2681,4 +2681,6 @@ export default {
   去发布: '去发布',
   我发起的测试: '我发起的测试',
   '代码分支/代码 Commit/创建人/测试进度': '代码分支/代码 Commit/创建人/测试进度',
+  'S-mart 应用请在配置文件中设置并开启增强服务': 'S-mart 应用请在配置文件中设置并开启增强服务',
+  'S-mart 应用暂不支持删除增强服务': 'S-mart 应用暂不支持删除增强服务',
 };
diff --git a/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/app-services.vue b/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/app-services.vue
index 9fc0f065a7..fb8543497a 100644
--- a/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/app-services.vue
+++ b/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/app-services.vue
@@ -106,23 +106,29 @@
               <div
                 class="ps-switcher-wrapper"
                 @click="toggleSwitch(row, $index)"
+                v-bk-tooltips="{
+                  content: $t('S-mart 应用请在配置文件中设置并开启增强服务'),
+                  disabled: !isSmartApp
+                }"
                 v-if="row.isStartUp">
                 <bk-switcher
                   v-model="row.isStartUp"
                   :theme="row.type === 'shared' ? 'success' : 'primary'"
                   class="bk-small-switcher"
+                  :disabled="isSmartApp"
                 />
               </div>
               <div
                 class="ps-switcher-wrapper"
                 v-else
                 @click="toggleSwitch(row, $index)"
-                v-bk-tooltips="switcherTips"
+                v-bk-tooltips="enableTooltipsConfig"
                 :ref="`tooltipsHtml${$index}`"
               >
                 <bk-switcher
                   v-model="row.isStartUp"
                   class="bk-small-switcher"
+                  :disabled="isSmartApp"
                 />
               </div>
               <div id="switcher-tooltip">
@@ -381,6 +387,18 @@ export default {
         return versionData?.value || '';
       };
     },
+    isSmartApp() {
+      return this.curAppInfo.application?.is_smart_app;
+    },
+    enableTooltipsConfig() {
+      this.switcherTips.disabled = this.isSmartApp;
+      if (this.isSmartApp) {
+        return {
+          content: this.$t('S-mart 应用暂不支持删除增强服务'),
+        };
+      }
+      return this.switcherTips;
+    },
   },
   watch: {
     curAppCode() {
@@ -458,6 +476,9 @@ export default {
     },
 
     toggleSwitch(payload, index) {
+      if (this.isSmartApp) {
+        return;
+      }
       this.curData = payload;
       this.curIndex = index;
       if (payload.isStartUp) {    // 已经启动的状态

From c924f6dc67e8c4f1bf3ab4eca71a8edf706ec0e0 Mon Sep 17 00:00:00 2001
From: leafage-collb <3303710797@qq.com>
Date: Wed, 13 Mar 2024 14:57:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20S-mart-=E6=9E=84=E5=BB=BA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/engine/cloud-deployment/deploy-build.vue   |  6 +++++-
 .../cloud-deployment/image-credential/index.vue    | 14 ++++++++++++--
 .../views/dev-center/app/engine/packages/index.vue | 11 ++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/deploy-build.vue b/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/deploy-build.vue
index db180f3354..09ca019baf 100644
--- a/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/deploy-build.vue
+++ b/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/deploy-build.vue
@@ -39,7 +39,11 @@
           @close-content-loader="closeContentLoader"
         />
         <!-- 镜像信息 -->
-        <mirror @close-content-loader="closeContentLoader" @set-build-method="setBuildMethod" />
+        <mirror
+          v-if="!isSmartApp"
+          @close-content-loader="closeContentLoader"
+          @set-build-method="setBuildMethod"
+        />
       </template>
     </paas-content-loader>
   </div>
diff --git a/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/image-credential/index.vue b/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/image-credential/index.vue
index 1e954e6bc8..f3a138f2be 100644
--- a/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/image-credential/index.vue
+++ b/webfe/package_vue/src/views/dev-center/app/engine/cloud-deployment/image-credential/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="image-container">
     <paas-content-loader
-      class="image-content"
+      :class="['image-content', { 'bottom-line': curAppInfo?.feature?.ENABLE_IMAGE_APP_BIND_REPO }]"
       :is-loading="isLoading"
       :is-transition="false"
       :offset-top="0"
@@ -130,9 +130,12 @@ export default {
     curAppCode() {
       return this.$store.state.curAppCode;
     },
+    curAppInfo() {
+      return this.$store.state.curAppInfo;
+    },
   },
   watch: {
-    curAppCode() {
+    appCode() {
       this.getCredentialList();
       // this.isLoading = true;
     },
@@ -141,6 +144,9 @@ export default {
       this.credentialList = value;
     },
   },
+  created() {
+    this.getCredentialList();
+  },
   methods: {
 
     // 获取凭证列表
@@ -293,6 +299,10 @@ export default {
   .image-content {
     background: #fff;
     padding-top: 0;
+    &.bottom-line {
+      margin-bottom: 24px;
+      border-bottom: 1px solid #eaebf0;
+    }
   }
 }
 .header-title {
diff --git a/webfe/package_vue/src/views/dev-center/app/engine/packages/index.vue b/webfe/package_vue/src/views/dev-center/app/engine/packages/index.vue
index f9110e631b..6522d3ba0f 100644
--- a/webfe/package_vue/src/views/dev-center/app/engine/packages/index.vue
+++ b/webfe/package_vue/src/views/dev-center/app/engine/packages/index.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <div :class="['right-main', { 'packages-wrapper': isCloudNativeApp }]">
+  <div :class="['right-main',{ 'packages-wrapper': isCloudNativeApp }, { 'bottom-line': !isSmartApp }]">
     <app-top-bar
       v-if="!isCloudNativeApp"
       :title="$t('包版本管理')"
@@ -7,7 +7,7 @@
       :cur-module="curAppModule"
       :module-list="isLesscodeApp ? curAppModuleList : []"
     />
-    <div class="title" v-else>{{ $t('源码信息') }}</div>
+    <div class="title" v-else>{{ isSmartApp ? $t('包版本管理') : $t('源码信息') }}</div>
     <paas-content-loader
       :is-loading="isPageLoading"
       placeholder="packages-loading"
@@ -299,6 +299,9 @@ export default {
     uploadUrl() {
       return `${BACKEND_URL}/api/bkapps/applications/${this.appCode}/source_package/stash/`;
     },
+    isSmartApp() {
+      return this.curAppInfo.application?.is_smart_app;
+    },
   },
   watch: {
     '$route'() {
@@ -553,8 +556,10 @@ export default {
         margin-top: 2px;
     }
     .packages-wrapper {
-        border-bottom: 1px solid #eaebf0;
         margin-bottom: 24px;
+        &.bottom-line {
+          border-bottom: 1px solid #eaebf0;
+        }
         .title {
             font-weight: 700;
             font-size: 14px;

From 2281047826705e0bef81bad102ab0ef50decef05 Mon Sep 17 00:00:00 2001
From: leafage-collb <3303710797@qq.com>
Date: Wed, 13 Mar 2024 16:35:24 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E5=B8=82=E5=9C=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4smart=E5=BA=94=E7=94=A8=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dev-center/app/market/index.scss    |  6 +++++
 .../dev-center/app/market/market-info.vue     |  5 ++++-
 .../dev-center/app/market/market-manager.vue  | 22 +++++--------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/webfe/package_vue/src/views/dev-center/app/market/index.scss b/webfe/package_vue/src/views/dev-center/app/market/index.scss
index 1a29fe67b4..886a91443b 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/index.scss
+++ b/webfe/package_vue/src/views/dev-center/app/market/index.scss
@@ -193,6 +193,12 @@
             color: #313238;
             word-wrap: break-word;
             width: 290px;
+
+            &.text-ellipsis  {
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
         }
         /deep/ .bk-form-item .bk-label{
             width: 140px !important;
diff --git a/webfe/package_vue/src/views/dev-center/app/market/market-info.vue b/webfe/package_vue/src/views/dev-center/app/market/market-info.vue
index b737fe2f8d..3033dcfff6 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/market-info.vue
+++ b/webfe/package_vue/src/views/dev-center/app/market/market-info.vue
@@ -102,7 +102,7 @@
           {{ curAddress }}
         </div>
         <bk-button
-          class="address-info-btn"
+          :class="{ 'pl24': curAddress }"
           theme="primary"
           text
           :disabled="isEditDisabled"
@@ -743,4 +743,7 @@ export default {
     .form-input-cls{
       position: relative;
     }
+    .pl24 {
+      padding-left: 24px;
+    }
 </style>
diff --git a/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue b/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue
index b5fbf2837b..e13f84b526 100644
--- a/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue
+++ b/webfe/package_vue/src/views/dev-center/app/market/market-manager.vue
@@ -21,7 +21,7 @@
             {{ $t('编辑') }}
           </bk-button>
         </div>
-        <div v-if="!isSaveMarketInfo">
+        <div v-if="!isSaveMarketInfo && !isSmartApp">
           <bk-form
             class="market-info-container"
             ref="baseInfoForm"
@@ -323,28 +323,22 @@
             </bk-form-item>
             <bk-form-item
               :label="$t('应用联系人：')"
-              v-if="!isSmartApp && GLOBAL.CONFIG.MARKET_INFO"
+              v-if="GLOBAL.CONFIG.MARKET_INFO"
               :rules="baseInfoRules.appArrange"
               :icon-offset="380"
             >
               <p class="form-text">{{ baseInfo.contactArr.join('; ') || '--' }}</p>
             </bk-form-item>
             <bk-form-item
-              v-if="!isSmartApp && GLOBAL.CONFIG.MARKET_INFO && baseInfo.related_corp_products.length"
+              v-if="GLOBAL.CONFIG.MARKET_INFO && baseInfo.related_corp_products.length"
               :label="$t('所属业务：')"
             >
               <p class="form-text">{{ businessDetailName || '--' }}</p>
             </bk-form-item>
-            <bk-form-item
-              v-if="!isSmartApp"
-              :label="$t('详细描述：')"
-            >
-              <p class="form-text">{{ baseInfo.description || '--' }}</p>
+            <bk-form-item :label="$t('详细描述：')">
+              <p class="form-text text-ellipsis" v-bk-overflow-tips>{{ baseInfo.description || '--' }}</p>
             </bk-form-item>
-            <bk-form-item
-              v-if="!isSmartApp"
-              :label="$t('打开方式：')"
-            >
+            <bk-form-item :label="$t('打开方式：')">
               <p class="form-text">{{ baseInfo.open_mode === 'desktop' ? $t('桌面') : $t('新标签页') }}</p>
             </bk-form-item>
             <bk-form-item
@@ -660,10 +654,6 @@ export default {
         this.baseInfo.updated = application.updated;
         this.baseInfo.region_name = application.region_name;
         this.isSaveMarketInfo = res.product;
-        // S-mart 应用只有查看态
-        if (this.isSmartApp) {
-          this.isSaveMarketInfo = true;
-        }
         // 通过product判断应用是否已经保存过
         if (res.product) {
           // 已注册用户判断是否在生产环境发布部署