dashboard-shell-shell 0.0.1000000000001138 → 1.0.6

package/assets/styles/base/_variables.scss

@@ -19,7 +19,7 @@ $input-width: 400px;
 
 $input-padding-lg: 18px;
 $input-padding-sm: 10px;
-$input-line-height: 18px;
+$input-line-height: 32px;
 
 $column-gutter: 1.75%;
 

package/assets/styles/global/_labeled-input.scss

@@ -10,7 +10,6 @@
 
   &.compact-input {
     min-height: $unlabeled-input-height;
-    padding: 0 10px;
 
     INPUT.no-label {
       line-height: $input-line-height;

package/assets/styles/global/_table.scss

@@ -104,3 +104,8 @@
       }
     }
   }
+
+
+  .sortable-table tbody tr.group-row td:first-of-type {
+    background-color: var(--sortable-table-bg) !important;
+  }

package/components/ActionMenuShell.vue

@@ -18,6 +18,7 @@ type RcDropdownMenuComponentProps = {
   dataTestid?: string;
   resource: Object;
   customActions?: DropdownOption[];
+  showIcon?: Boolean;
 }
 
 const props = defineProps <RcDropdownMenuComponentProps>();
@@ -100,6 +101,7 @@ const menuOptions = () => {
     :dropdown-aria-label="dropdownAriaLabel"
     :options="menuOptions()"
     :data-testid="dataTestid"
+    :showIcon="showIcon"
     @update:open="openChanged"
     @select="(e: MouseEvent, option: object) => execute(option, e)"
   />

package/components/ExplorerProjectsNamespaces.vue

@@ -416,6 +416,7 @@ export default {
 </script>
 
 <template>
+  测试111111111111111111111111
   <div class="project-namespaces outlet">
     <Masthead
       :schema="projectSchema"
@@ -505,21 +506,19 @@ export default {
           <div class="right">
             <router-link
               v-if="isNamespaceCreatable && (canSeeProjectlessNamespaces || group.group.key !== notInProjectKey)"
-              class="create-namespace btn btn-sm mr-5"
+              class="create-namespace"
+              style="margin-bottom: 3px;"
               :to="createNamespaceLocation(group.group)"
             >
               {{ t('projectNamespaces.createNamespace') }}
             </router-link>
+            <span style="color: var(--link);margin-bottom: 3px;">|</span>
             <template v-if="featureDropdownMenu">
               <ActionMenu
-                v-if="showProjectActionButton(group.group)"
+                :showIcon="true"
                 :resource="getProjectActions(group.group)"
                 :button-aria-label="t('projectNamespaces.tableActionsLabel', { resource: projectResource(group.group) })"
               />
-              <div
-                v-else
-                class="invisible"
-              />
             </template>
             <template v-else>
               <ButtonMultiAction
@@ -595,6 +594,7 @@ export default {
 </template>
 <style lang="scss" scoped>
 .invisible {
+  width: 42px;
   display: inline-block;
 }
 
@@ -621,6 +621,7 @@ export default {
 
       .create-namespace {
         color: var(--link);
+        padding: 0 18px;
       }
 
       .group-tab {

package/components/form/ResourceQuota/Namespace.vue

@@ -72,13 +72,13 @@ export default {
 <template>
   <div>
     <div class="headers mb-10">
-      <div class="mr-10">
+      <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>
-      <div class="mr-10">
+      <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.projectResourceAvailability') }}</label>
       </div>
-      <div class="mr-20">
+      <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.limit') }}</label>
       </div>
     </div>
@@ -101,7 +101,7 @@ export default {
 .headers {
     display: flex;
     flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: space-between;
     align-items: center;
     border-bottom: 1px solid var(--border);
     height: 30px;

package/components/form/ResourceQuota/NamespaceRow.vue

@@ -173,16 +173,15 @@ export default {
 <template>
   <div
     v-if="typeOption"
-    class="row"
+    class="rowNew"
   >
     <Select
-      class="mr-10"
       :mode="mode"
       :value="type"
       :disabled="true"
       :options="types"
     />
-    <div class="resource-availability mr-10">
+    <div class="resource-availability">
       <PercentageBar
         v-clean-tooltip="tooltip"
         class="percentage-bar"
@@ -208,13 +207,12 @@ export default {
   .resource-availability {
     align-self: center;
   }
-  .row {
+  .rowNew {
     display: flex;
-    flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: space-between;
 
     & > * {
-      width: 100%;
+      width: 400px;
     }
   }
 </style>

package/components/form/ResourceQuota/Project.vue

@@ -57,14 +57,14 @@ export default {
 </script>
 <template>
   <div>
-    <div class="headers mb-10">
-      <div class="mr-10">
+    <div style="justify-content: right;" class="headers mb-10">
+      <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.resourceType') }}</label>
       </div>
-      <div class="mr-20">
+      <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.projectLimit') }}</label>
       </div>
-      <div class="mr-10">
+      <div style="width: 400px;">
         <label>{{ t('resourceQuota.headers.namespaceDefaultLimit') }}</label>
       </div>
     </div>

package/components/form/ResourceQuota/ProjectRow.vue

@@ -70,11 +70,11 @@ export default {
 <template>
   <div
     v-if="typeOption"
-    class="row"
+    style="justify-content: right;"
+    class="rowNew"
   >
     <Select
       :value="type"
-      class="mr-10"
       :mode="mode"
       :options="types"
       data-testid="projectrow-type-input"
@@ -82,7 +82,6 @@ export default {
     />
     <UnitInput
       :value="resourceQuotaLimit[type]"
-      class="mr-10"
       :mode="mode"
       :placeholder="typeOption.placeholder"
       :increment="typeOption.increment"
@@ -107,9 +106,8 @@ export default {
 </template>
 
 <style lang='scss' scoped>
-  .row {
+  .rowNew {
     display: flex;
-    flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: space-between;
   }
 </style>

package/components/form/UnitInput.vue

@@ -238,10 +238,10 @@ export default {
     @update:value="update"
     @blur="update($event.target.value)"
   >
-    <template #suffix>
+    <template #suffixNew>
       <div
         v-if="displayUnit"
-        class="addon"
+        class="addonNew"
         :class="{'with-tooltip': tooltip || tooltipKey}"
       >
         {{ displayUnit }}
@@ -251,7 +251,12 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-  .addon.with-tooltip {
+  .addonNew.with-tooltip {
     padding-right: 42px;
   }
+  .addonNew {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+  }
 </style>

package/edit/networking.k8s.io.ingress/RulePath.vue

@@ -189,7 +189,7 @@ $row-height: 40px;
     height: 100%;
 
     input.no-label {
-      height: calc($row-height - 2px);
+      height: 32px;
       padding: 10px;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "0.0.1000000000001138",
+  "version": "1.0.6",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/rancher-components/Form/Checkbox/Checkbox.vue

@@ -301,6 +301,7 @@ export default defineComponent({
           <span
             v-else-if="label"
             :id="idForLabel"
+            :style="label == '记住用户名' ? { color: '#fff' } : ''"
           >{{ label }}</span>
           <i
             v-if="tooltipKey"

package/rancher-components/Form/LabeledInput/LabeledInput.vue

@@ -464,6 +464,7 @@ export default defineComponent({
       />
     </div>
   </div>
+  <slot name="suffixNew" />
 </div>
 </template>
 <style scoped lang="scss">

package/rancher-components/Form/TextArea/TextAreaAutoGrow.vue

@@ -108,7 +108,7 @@ export default defineComponent({
      * (unless the input is long)
      */
     style(): string {
-      return `height: ${ this.curHeight }px; overflow: ${ this.overflow };`;
+      return `height: ${ this.curHeight }px; overflow: ${ this.overflow };min-height:${ this.curHeight }px;`;
     },
 
     className(): string | unknown[] | Record<string, boolean> {

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -33,8 +33,10 @@ const hasOptions = (options: DropdownOption[]) => {
       :data-testid="dataTestid"
       :aria-label="buttonAriaLabel"
     >
-    <!-- <img v-if="showIcon" src="@/shell/assets/images/action.svg" title="操作"> -->
-    <a href="javascript:;">操作</a>
+    <div v-if="showIcon">
+      <i data-v-5db2c2c7="" class="icon icon-actions" alt="More actions icon"></i>
+    </div>
+    <a v-else href="javascript:;">操作</a>
     </rc-dropdown-trigger>
     <template #dropdownCollection>
       <template