Ver código fonte

Merge branch 'dev' into dev_zyh

Jack Zhou 2 meses atrás
pai
commit
c2d3ea5b44

+ 1 - 2
src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -69,6 +68,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

+ 11 - 2
src/components/CreateAddRules/src/components/ShipmentRange.vue

@@ -272,7 +272,9 @@ defineExpose({
     <el-collapse v-model="OceanActive">
       <el-collapse-item name="TransportMode">
         <template #title>
-          <span class="stars_red">*</span><div class="Rules_Title OceanTitle">Transport Mode</div>
+          <div class="Rules_Title_flex">
+            <span class="stars_red">*</span><div class="Rules_Title OceanTitle">Transport Mode</div>
+          </div>
         </template>
         <div class="oceanCheckbox">
           <el-checkbox-group @change="CheckChange" v-model="TransportCheckedList">
@@ -287,7 +289,9 @@ defineExpose({
       </el-collapse-item>
       <el-collapse-item name="Time">
         <template #title>
-          <span class="stars_red">*</span><div class="Rules_Title OceanTitle">Time</div>
+          <div class="Rules_Title_flex">
+            <span class="stars_red">*</span><div class="Rules_Title OceanTitle">Time</div>
+          </div>
         </template>
         <div class="oceanCheckbox">
           <el-radio-group v-model="TimeChecked" @change="changeTime">
@@ -516,4 +520,9 @@ defineExpose({
 .date_flex {
   flex: 1;
 }
+.Rules_Title_flex {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
 </style>