From b54a2b23db9074a1b2b43c123c56a5bb28b017fd Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 23 Mar 2023 18:15:32 +0800
Subject: [PATCH 1/4] fix expose

---
 packages/opendesign/src/components/select/OSelect.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/opendesign/src/components/select/OSelect.vue b/packages/opendesign/src/components/select/OSelect.vue
index 48f6e18d..2afc2448 100644
--- a/packages/opendesign/src/components/select/OSelect.vue
+++ b/packages/opendesign/src/components/select/OSelect.vue
@@ -59,11 +59,13 @@ provide(selectOptionInjectKey, {
   },
 });
 
+const updateLabel = (label: string, isVisible: boolean = false) => {
+  activeLabel.value = label;
+  showOption.value = isVisible;
+};
+
 defineExpose({
-  updateLabel(label: string, isVisible: boolean = false) {
-    activeLabel.value = label;
-    showOption.value = isVisible;
-  },
+  updateLabel,
 });
 </script>
 <template>
-- 
Gitee


From 5afd4c28ec55b2e7261a1312f1fc1864e2f1caea Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 23 Mar 2023 19:12:30 +0800
Subject: [PATCH 2/4] rm

---
 packages/components/icons1/icons.json | 1 -
 packages/components/icons1/index.ts   | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 packages/components/icons1/icons.json
 delete mode 100644 packages/components/icons1/index.ts

diff --git a/packages/components/icons1/icons.json b/packages/components/icons1/icons.json
deleted file mode 100644
index 0637a088..00000000
--- a/packages/components/icons1/icons.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/packages/components/icons1/index.ts b/packages/components/icons1/index.ts
deleted file mode 100644
index e69de29b..00000000
-- 
Gitee


From 5ad1bcf332d5a1b56762f1658d19022fd6225d9e Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 23 Mar 2023 23:44:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8Frow=20gap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/components/grid/OCol.vue   | 27 +++------
 .../opendesign/src/components/grid/ORow.vue   | 40 ++++++++++++-
 .../components/grid/__demo__/GridBasic.vue    | 16 +++++
 .../src/components/grid/style/index.scss      | 60 +++++++++++++++++++
 .../opendesign/src/components/grid/types.ts   | 57 ++++++++++++++++--
 .../src/components/slides/OSlides.vue         |  2 -
 6 files changed, 172 insertions(+), 30 deletions(-)

diff --git a/packages/opendesign/src/components/grid/OCol.vue b/packages/opendesign/src/components/grid/OCol.vue
index d3b781a7..176f96e3 100644
--- a/packages/opendesign/src/components/grid/OCol.vue
+++ b/packages/opendesign/src/components/grid/OCol.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { colProps } from './types';
+import { colProps, mediaSize, ColMediaT, ColPropsT } from './types';
 import { computed, StyleValue } from 'vue';
 
 const props = defineProps(colProps);
@@ -34,25 +34,12 @@ const style = computed(() => {
   if (props.align) {
     s['--col-align'] = props.align;
   }
-
-  if (props.xs) {
-    s['--col-basis-xs'] = props.xs.width;
-  }
-  if (props.s) {
-    s['--col-basis-s'] = props.s.width;
-  }
-  if (props.m) {
-    s['--col-basis-m'] = props.m.width;
-  }
-  if (props.l) {
-    s['--col-basis-l'] = props.l.width;
-  }
-  if (props.xl) {
-    s['--col-basis-xl'] = props.xl.width;
-  }
-  if (props.xxl) {
-    s['--col-basis-xxl'] = props.xxl.width;
-  }
+  mediaSize.forEach((k) => {
+    const v = props[k as keyof ColPropsT] as ColMediaT;
+    if (v) {
+      s[`--col-basis-${k}` as keyof Vars] = v.width;
+    }
+  });
   return s as StyleValue;
 });
 </script>
diff --git a/packages/opendesign/src/components/grid/ORow.vue b/packages/opendesign/src/components/grid/ORow.vue
index 5e53bb5b..ff5dd250 100644
--- a/packages/opendesign/src/components/grid/ORow.vue
+++ b/packages/opendesign/src/components/grid/ORow.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { rowProps } from './types';
+import { rowProps, mediaSize, RowPropsT, RowMediaT } from './types';
 import { computed, StyleValue } from 'vue';
 
 const props = defineProps(rowProps);
@@ -13,6 +13,30 @@ interface Vars {
   '--col-gap-x'?: string;
   '--row-gap-y'?: string;
   '--col-gap-y'?: string;
+  '--row-gap-x-xs'?: string;
+  '--col-gap-x-xs'?: string;
+  '--row-gap-y-xs'?: string;
+  '--col-gap-y-xs'?: string;
+  '--row-gap-x-s'?: string;
+  '--col-gap-x-s'?: string;
+  '--row-gap-y-s'?: string;
+  '--col-gap-y-s'?: string;
+  '--row-gap-x-m'?: string;
+  '--col-gap-x-m'?: string;
+  '--row-gap-y-m'?: string;
+  '--col-gap-y-m'?: string;
+  '--row-gap-x-l'?: string;
+  '--col-gap-x-l'?: string;
+  '--row-gap-y-l'?: string;
+  '--col-gap-y-l'?: string;
+  '--row-gap-x-xl'?: string;
+  '--col-gap-x-xl'?: string;
+  '--row-gap-y-xl'?: string;
+  '--col-gap-y-xl'?: string;
+  '--row-gap-x-xxl'?: string;
+  '--col-gap-x-xxl'?: string;
+  '--row-gap-y-xxl'?: string;
+  '--col-gap-y-xxl'?: string;
 }
 const style = computed(() => {
   const s: Vars = {};
@@ -36,8 +60,20 @@ const style = computed(() => {
     s['--col-gap-y'] = props.gapY;
     s['--row-gap-y'] = `calc(-1 * ${props.gapY})`;
   }
-  console.log(s);
 
+  mediaSize.forEach((key) => {
+    const v = props[key as keyof RowPropsT] as RowMediaT;
+    if (v) {
+      if (v.gapX) {
+        s[`--col-gap-x-${key}` as keyof Vars] = `calc(${v.gapX} / 2)`;
+        s[`--row-gap-x-${key}` as keyof Vars] = `calc(-1 * ${v.gapX} / 2)`;
+      }
+      if (v.gapY) {
+        s[`--col-gap-y-${key}` as keyof Vars] = `calc(${v.gapY} / 2)`;
+        s[`--row-gap-y-${key}` as keyof Vars] = `calc(-1 * ${v.gapY} / 2)`;
+      }
+    }
+  });
   return s as StyleValue;
 });
 </script>
diff --git a/packages/opendesign/src/components/grid/__demo__/GridBasic.vue b/packages/opendesign/src/components/grid/__demo__/GridBasic.vue
index 110c0a0f..8f8c3bd3 100644
--- a/packages/opendesign/src/components/grid/__demo__/GridBasic.vue
+++ b/packages/opendesign/src/components/grid/__demo__/GridBasic.vue
@@ -37,6 +37,22 @@ import { ORow, OCol } from '../index';
         <div class="box">{{ item }}</div>
       </OCol>
     </ORow>
+    <br />
+    <ORow
+      gap-x="16px"
+      gap-y="16px"
+      wrap="wrap"
+      :xs="{ gapX: '4px', gapY: '4px' }"
+      :s="{ gapX: '8px', gapY: '8px' }"
+      :m="{ gapX: '16px', gapY: '16px' }"
+      :l="{ gapX: '24px', gapY: '24px' }"
+      :xl="{ gapX: '32px', gapY: '32px' }"
+      :xxl="{ gapX: '48px', gapY: '48px' }"
+    >
+      <OCol v-for="item in 10" :key="item" width="20%" class="colored">
+        <div class="box">{{ item }}</div>
+      </OCol>
+    </ORow>
   </div>
 </template>
 <style lang="scss">
diff --git a/packages/opendesign/src/components/grid/style/index.scss b/packages/opendesign/src/components/grid/style/index.scss
index 75691655..0a256ad6 100644
--- a/packages/opendesign/src/components/grid/style/index.scss
+++ b/packages/opendesign/src/components/grid/style/index.scss
@@ -36,34 +36,94 @@ $media-xxl: 1920px;
   .o-col-xs {
     flex-basis: var(--col-basis-xs);
   }
+  .o-row {
+    margin-left: var(--row-gap-x-xs);
+    margin-right: var(--row-gap-x-xs);
+    margin-bottom: var(--row-gap-y-xs);
+  }
+  .o-col {
+    padding-left: var(--col-gap-x-xs);
+    padding-right: var(--col-gap-x-xs);
+    margin-bottom: var(--col-gap-y-xs);
+  }
 }
 
 @media (min-width: $media-s) {
   .o-col-s {
     flex-basis: var(--col-basis-s);
   }
+  .o-row {
+    margin-left: var(--row-gap-x-s);
+    margin-right: var(--row-gap-x-s);
+    margin-bottom: var(--row-gap-y-s);
+  }
+  .o-col {
+    padding-left: var(--col-gap-x-s);
+    padding-right: var(--col-gap-x-s);
+    margin-bottom: var(--col-gap-y-s);
+  }
 }
 
 @media (min-width: $media-m) {
   .o-col-m {
     flex-basis: var(--col-basis-m);
   }
+  .o-row {
+    margin-left: var(--row-gap-x-m);
+    margin-right: var(--row-gap-x-m);
+    margin-bottom: var(--row-gap-y-m);
+  }
+  .o-col {
+    padding-left: var(--col-gap-x-m);
+    padding-right: var(--col-gap-x-m);
+    margin-bottom: var(--col-gap-y-m);
+  }
 }
 
 @media (min-width: $media-l) {
   .o-col-l {
     flex-basis: var(--col-basis-l);
   }
+  .o-row {
+    margin-left: var(--row-gap-x-l);
+    margin-right: var(--row-gap-x-l);
+    margin-bottom: var(--row-gap-y-l);
+  }
+  .o-col {
+    padding-left: var(--col-gap-x-l);
+    padding-right: var(--col-gap-x-l);
+    margin-bottom: var(--col-gap-y-l);
+  }
 }
 
 @media (min-width: $media-xl) {
   .o-col-xl {
     flex-basis: var(--col-basis-xl);
   }
+  .o-row {
+    margin-left: var(--row-gap-x-xl);
+    margin-right: var(--row-gap-x-xl);
+    margin-bottom: var(--row-gap-y-xl);
+  }
+  .o-col {
+    padding-left: var(--col-gap-x-xl);
+    padding-right: var(--col-gap-x-xl);
+    margin-bottom: var(--col-gap-y-xl);
+  }
 }
 
 @media (min-width: $media-xxl) {
   .o-col-xxl {
     flex-basis: var(--col-basis-xxl);
   }
+  .o-row {
+    margin-left: var(--row-gap-x-xxl);
+    margin-right: var(--row-gap-x-xxl);
+    margin-bottom: var(--row-gap-y-xxl);
+  }
+  .o-col {
+    padding-left: var(--col-gap-x-xxl);
+    padding-right: var(--col-gap-x-xxl);
+    margin-bottom: var(--col-gap-y-xxl);
+  }
 }
diff --git a/packages/opendesign/src/components/grid/types.ts b/packages/opendesign/src/components/grid/types.ts
index 1a4c2a2f..ce9f06d3 100644
--- a/packages/opendesign/src/components/grid/types.ts
+++ b/packages/opendesign/src/components/grid/types.ts
@@ -1,4 +1,13 @@
 import { ExtractPropTypes, PropType } from 'vue';
+export interface RowMediaT {
+  gapY: string;
+  gapX: string;
+}
+export interface ColMediaT {
+  width: string;
+}
+
+export const mediaSize = ['xs', 's', 'm', 'l', 'xl', 'xxl'];
 
 export const rowProps = {
   /**
@@ -43,6 +52,42 @@ export const rowProps = {
   gapY: {
     type: String,
   },
+  /**
+   * @media (min-width: 576px)
+   */
+  xs: {
+    type: Object as PropType<RowMediaT>,
+  },
+  /**
+   * @media (min-width: 721px)
+   */
+  s: {
+    type: Object as PropType<RowMediaT>,
+  },
+  /**
+   * @media (min-width: 1201px)
+   */
+  m: {
+    type: Object as PropType<RowMediaT>,
+  },
+  /**
+   * @media (min-width: 1441px)
+   */
+  l: {
+    type: Object as PropType<RowMediaT>,
+  },
+  /**
+   * @media (min-width: 1681px)
+   */
+  xl: {
+    type: Object as PropType<RowMediaT>,
+  },
+  /**
+   * @media (min-width: 1920px)
+   */
+  xxl: {
+    type: Object as PropType<RowMediaT>,
+  },
 };
 
 export const colProps = {
@@ -80,37 +125,37 @@ export const colProps = {
    * @media (min-width: 576px)
    */
   xs: {
-    type: Object,
+    type: Object as PropType<ColMediaT>,
   },
   /**
    * @media (min-width: 721px)
    */
   s: {
-    type: Object,
+    type: Object as PropType<ColMediaT>,
   },
   /**
    * @media (min-width: 1201px)
    */
   m: {
-    type: Object,
+    type: Object as PropType<ColMediaT>,
   },
   /**
    * @media (min-width: 1441px)
    */
   l: {
-    type: Object,
+    type: Object as PropType<ColMediaT>,
   },
   /**
    * @media (min-width: 1681px)
    */
   xl: {
-    type: Object,
+    type: Object as PropType<ColMediaT>,
   },
   /**
    * @media (min-width: 1920px)
    */
   xxl: {
-    type: Object,
+    type: Object as PropType<ColMediaT>,
   },
 };
 
diff --git a/packages/opendesign/src/components/slides/OSlides.vue b/packages/opendesign/src/components/slides/OSlides.vue
index 20038e9d..34d898d5 100644
--- a/packages/opendesign/src/components/slides/OSlides.vue
+++ b/packages/opendesign/src/components/slides/OSlides.vue
@@ -144,8 +144,6 @@ const ininCarouselSlides = () => {
   }
 
   slideElList.value.forEach((el, idx) => {
-    const { clientWidth } = el;
-    el.style.left = `${clientWidth * idx}px`;
     el.addEventListener('click', () => {
       activeCarouselSlideByIndex(idx);
     });
-- 
Gitee


From a45d422923ae3e1cd24657a9a9ddbd0602b09663 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 23 Mar 2023 23:45:51 +0800
Subject: [PATCH 4/4] version

---
 packages/opendesign/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opendesign/package.json b/packages/opendesign/package.json
index 67d37473..3034c023 100644
--- a/packages/opendesign/package.json
+++ b/packages/opendesign/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensig/opendesign",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "types": "es/index.d.ts",
-- 
Gitee