chore: batch clone service

seal-io · Aug 24, 2023 · c2248a0 · c2248a0
1 parent f5c6af0
commit c2248a0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/src/assets/style/arco-reset/form.less b/src/assets/style/arco-reset/form.less
@@ -49,6 +49,7 @@
   .arco-form-item-extra .tips {
     color: var(--color-text-3);
     font-size: 12px;
+    line-height: 16px;
     opacity: 0.7;
   }
 
@@ -57,6 +58,7 @@
   }
 
   .arco-form-item-extra {
+    margin-top: 0;
     text-align: left;
   }
 }
diff --git a/src/assets/style/form.less b/src/assets/style/form.less
@@ -14,6 +14,10 @@
       .arco-form-item-extra {
         display: none;
       }
+
+      .arco-form-item-message {
+        line-height: 16px;
+      }
     }
   }
   // .arco-textarea-word-limit,.arco-input-word-limit {

diff --git a/src/components/hint-input/index.vue b/src/components/hint-input/index.vue
@@ -21,7 +21,10 @@
           ></span
         >
         <a-tooltip v-if="popupInfo" :content="popupInfo">
-          <icon-info-circle style="stroke-linecap: initial; cursor: default" />
+          <icon-info-circle
+            style="stroke-linecap: initial; cursor: default"
+            class="m-l-2"
+          />
         </a-tooltip>
       </span>
       <input

diff --git a/src/components/hint-input/style/input.less b/src/components/hint-input/style/input.less
@@ -12,7 +12,6 @@
     left: @paddingLeft;
     display: flex;
     align-items: center;
-    justify-content: space-between;
     color: var(--color-text-3);
     font-size: 12px;
     transform: translateY(calc(-50% + 1px));

diff --git a/src/components/seal-form/style/index.less b/src/components/seal-form/style/index.less
@@ -46,7 +46,6 @@
     z-index: 5;
     display: flex;
     align-items: center;
-    justify-content: space-between;
     color: var(--color-text-3);
     font-size: 12px;
     transform: translateY(calc(-50% + 1px));

diff --git a/src/views/application-management/services/pages/clone.vue b/src/views/application-management/services/pages/clone.vue
@@ -60,13 +60,8 @@
                 :loading="formData.environmentID === item.id && submitLoading"
                 :status="setStatus(item.id)"
               >
-                <icon-check-circle-fill
-                  v-if="_.includes(succeedList, item.id)"
-                />
-                <icon-close-circle-fill
-                  v-if="_.includes(failedList, item.id)"
-                />
-                <span v-if="_.includes(failedList, item.id)">
+                <icon-check-circle-fill v-if="succeedList.has(item.id)" />
+                <span v-if="failedList.has(item.id) && !submitLoading">
                   <a-tooltip :content="errorMap.get(item.id)">
                     <i class="iconfont icon-warning-filling mleft-5"></i>
                   </a-tooltip>
@@ -168,6 +163,7 @@
   });
 
   const setStatus = (id) => {
+    if (submitLoading.value) return 'normal';
     if (succeedList.value.has(id)) {
       return 'success';
     }
@@ -265,12 +261,13 @@
     }
   };
   onBeforeRouteLeave(async (to, from) => {
-    if (!_.isEqual(copyFormData, formData)) {
+    if (!_.isEqual(copyFormData, formData) || failedList.value.size) {
       beforeLeaveCallback({
         to,
         from,
         onOk: () => {
           copyFormData = _.cloneDeep(formData);
+          failedList.value.clear();
           router.push({
             name: to.name as string
           });

diff --git a/src/views/operation-hub/catalogs/components/add-catalog.vue b/src/views/operation-hub/catalogs/components/add-catalog.vue
@@ -201,7 +201,7 @@
       value: 'Gitlab'
     }
   ];
-  const sealCatalog = 'https://github.com/terraform-seal-modules';
+  const sealCatalog = 'https://github.com/walrus-catalog';
   const emit = defineEmits(['save', 'update:show', 'update:dataInfo']);
   const formref = ref();
   const loading = ref(false);

diff --git a/src/views/operation-hub/templates/pages/detail.vue b/src/views/operation-hub/templates/pages/detail.vue
@@ -42,6 +42,7 @@
             :hide-label="pageAction === PageAction.EDIT"
             :disabled="!!id"
             :validate-trigger="['change']"
+            :style="{ width: `${InputWidth.LARGE}px` }"
             :rules="[
               {
                 required: true,
@@ -63,7 +64,7 @@
               formData.name || '-'
             }}</span>
             <template v-if="pageAction === PageAction.EDIT" #extra>
-              <span class="tips">{{ $t('common.validate.labelName') }}</span>
+              <div class="tips">{{ $t('common.validate.labelName') }}</div>
             </template>
           </a-form-item>
           <a-form-item