From d96eaace06f33040ad3c5ee5bcd3b8b0458f6de3 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Tue, 11 Apr 2023 16:22:59 +0800
Subject: [PATCH 1/2] export loading/layer

---
 .../src/components/carousel/__demo__/CarouselBasic.vue      | 2 +-
 .../opendesign/src/components/flex/__demo__/FlexBasic.vue   | 2 +-
 packages/opendesign/src/components/index.scss               | 6 +++++-
 packages/opendesign/src/components/index.ts                 | 6 +++++-
 packages/opendesign/src/components/result/OResult.vue       | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/opendesign/src/components/carousel/__demo__/CarouselBasic.vue b/packages/opendesign/src/components/carousel/__demo__/CarouselBasic.vue
index fd4de129..9dec517b 100644
--- a/packages/opendesign/src/components/carousel/__demo__/CarouselBasic.vue
+++ b/packages/opendesign/src/components/carousel/__demo__/CarouselBasic.vue
@@ -96,7 +96,7 @@ const initSlides = () => {
 }
 .carousel {
   height: 200px;
-  width: 80%;
+  width: 50%;
   margin: auto;
 }
 .slides2 {
diff --git a/packages/opendesign/src/components/flex/__demo__/FlexBasic.vue b/packages/opendesign/src/components/flex/__demo__/FlexBasic.vue
index 6c595044..58521b1d 100644
--- a/packages/opendesign/src/components/flex/__demo__/FlexBasic.vue
+++ b/packages/opendesign/src/components/flex/__demo__/FlexBasic.vue
@@ -17,7 +17,7 @@ import { OFlex, OFlexItem } from '../index';
       <OFlexItem flex="25%" class="colored">
         <div class="box">box</div>
       </OFlexItem>
-      <OFlexItem flex="50%" :shrink="0" class="colored">
+      <OFlexItem flex="50%" class="colored">
         <div class="box">box</div>
       </OFlexItem>
       <OFlexItem flex="25%" class="colored">
diff --git a/packages/opendesign/src/components/index.scss b/packages/opendesign/src/components/index.scss
index f10f5ea1..20582327 100644
--- a/packages/opendesign/src/components/index.scss
+++ b/packages/opendesign/src/components/index.scss
@@ -26,12 +26,16 @@
 @use './breadcrumb/style/index.scss' as *;
 @use './dropdown/style/index.scss' as *;
 @use './progress/style/index.scss' as *;
+@use './layer/style/index.scss' as *;
 @use './dialog/style/index.scss' as *;
+@use './loading/style/index.scss' as *;
 @use './figure/style/index.scss' as *;
 @use './card/style/index.scss' as *;
 @use './carousel/style/index.scss' as *;
 @use './message/style/index.scss' as *;
 @use './cascader/style/index.scss' as *;
-@use './grid/style/index.scss' as *;
 @use './flex/style/index.scss' as *;
 @use './result/style/index.scss' as *;
+
+// 待废弃
+@use './grid/style/index.scss' as *;
diff --git a/packages/opendesign/src/components/index.ts b/packages/opendesign/src/components/index.ts
index 53217e82..fb0bb52b 100644
--- a/packages/opendesign/src/components/index.ts
+++ b/packages/opendesign/src/components/index.ts
@@ -29,13 +29,14 @@ export * from './menu';
 export * from './breadcrumb';
 export * from './progress';
 export * from './dropdown';
+export * from './layer';
 export * from './dialog';
+export * from './loading';
 export * from './figure';
 export * from './card';
 export * from './message';
 export * from './carousel';
 export * from './cascader';
-export * from './grid';
 export * from './flex';
 export * from './result';
 
@@ -43,3 +44,6 @@ export * from './result';
 export * from './intersection-observer';
 export * from './resize-observer';
 export * from './child-only';
+
+// 待废弃
+export * from './grid';
diff --git a/packages/opendesign/src/components/result/OResult.vue b/packages/opendesign/src/components/result/OResult.vue
index 6aed040a..cc408353 100644
--- a/packages/opendesign/src/components/result/OResult.vue
+++ b/packages/opendesign/src/components/result/OResult.vue
@@ -13,7 +13,7 @@ const iconMap = {
   danger: IconError,
 };
 
-const icon = computed(() => iconMap[props.status]);
+const icon = computed(() => (props.status ? iconMap[props.status] : undefined));
 </script>
 
 <template>
-- 
Gitee


From 2a355aac9f7d0c15ff35d7a6722da790246aff7f Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Tue, 11 Apr 2023 16:24:44 +0800
Subject: [PATCH 2/2] v28

---
 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 865c3d71..686192cc 100644
--- a/packages/opendesign/package.json
+++ b/packages/opendesign/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensig/opendesign",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "types": "es/index.d.ts",
-- 
Gitee