From 7972d50859702db71f121013eb4bee0ae8d3c2c0 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 15:29:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0log=E5=8D=95?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/_utils/log.ts | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 packages/opendesign/src/_utils/log.ts

diff --git a/packages/opendesign/src/_utils/log.ts b/packages/opendesign/src/_utils/log.ts
new file mode 100644
index 00000000..08234aea
--- /dev/null
+++ b/packages/opendesign/src/_utils/log.ts
@@ -0,0 +1,32 @@
+const logFunction = {
+  info: console.info,
+  warn: console.warn,
+  error: console.error,
+};
+
+export type LogLevel = keyof typeof logFunction;
+
+function printLog(level: LogLevel, ...msg: any[]) {
+  const fn = logFunction[level];
+  if (fn) {
+    fn(...msg);
+  }
+}
+
+export class Log {
+  info(...msg: any[]) {
+    printLog('info', ...msg);
+  }
+
+  warn(...msg: any[]) {
+    printLog('warn', ...msg);
+  }
+
+  error(...msg: any[]) {
+    printLog('error', ...msg);
+  }
+}
+
+const logger = new Log();
+
+export default logger;
-- 
Gitee


From ad281109f111ae3453cd655834ec8b6224f68fe8 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 15:43:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20log=E5=A2=9E=E5=8A=A0namespace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/_utils/log.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/opendesign/src/_utils/log.ts b/packages/opendesign/src/_utils/log.ts
index 08234aea..903fd9e6 100644
--- a/packages/opendesign/src/_utils/log.ts
+++ b/packages/opendesign/src/_utils/log.ts
@@ -14,15 +14,31 @@ function printLog(level: LogLevel, ...msg: any[]) {
 }
 
 export class Log {
+  prefix: string;
+  constructor(namespace?: string) {
+    this.prefix = '';
+    if (namespace) {
+      this.prefix = `[${namespace}]`;
+    }
+  }
   info(...msg: any[]) {
+    if (this.prefix) {
+      msg.unshift(this.prefix);
+    }
     printLog('info', ...msg);
   }
 
   warn(...msg: any[]) {
+    if (this.prefix) {
+      msg.unshift(this.prefix);
+    }
     printLog('warn', ...msg);
   }
 
   error(...msg: any[]) {
+    if (this.prefix) {
+      msg.unshift(this.prefix);
+    }
     printLog('error', ...msg);
   }
 }
-- 
Gitee


From 85bd6db2f2b46e0d88ffba11124fd3c9289da14b Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 15:44:05 +0800
Subject: [PATCH 3/7] =?UTF-8?q?Oflex=E5=A2=9E=E5=8A=A0deprecatedt=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/flex/OFlex.vue | 3 +++
 packages/opendesign/src/index.ts       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/opendesign/src/flex/OFlex.vue b/packages/opendesign/src/flex/OFlex.vue
index 6dbb2942..276ba6b6 100644
--- a/packages/opendesign/src/flex/OFlex.vue
+++ b/packages/opendesign/src/flex/OFlex.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import logger from '../_utils/log';
 import { flexProps, FlexMediaT } from './types';
 import { computed } from 'vue';
 
@@ -50,6 +51,8 @@ const smGap = computed(() => {
 const xsGap = computed(() => {
   return getMediaGap(props.xs);
 });
+
+logger.warn('component OFlex|OFlexItem is deprecated, please use ORow|OCol instead');
 </script>
 <template>
   <div
diff --git a/packages/opendesign/src/index.ts b/packages/opendesign/src/index.ts
index 8e7884f3..6edef90c 100644
--- a/packages/opendesign/src/index.ts
+++ b/packages/opendesign/src/index.ts
@@ -38,7 +38,7 @@ export * from './card';
 export * from './message';
 export * from './carousel';
 export * from './cascader';
-export * from './flex';
+export * from './flex'; // deprecated
 export * from './grid';
 export * from './result';
 export * from './scroller';
-- 
Gitee


From 7a0a86098a1f4cbd95b377a3100ff4f0ece91510 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 15:45:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E6=96=87=E6=A1=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0OFlex=E7=9A=84=E5=B7=B2=E5=BA=9F=E5=BC=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/portal/src/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/portal/src/router.ts b/packages/portal/src/router.ts
index f1bb4b55..70f64362 100644
--- a/packages/portal/src/router.ts
+++ b/packages/portal/src/router.ts
@@ -215,7 +215,7 @@ export const routes = [
   {
     path: '/flex',
     name: 'Flex',
-    label: '布局 Flex',
+    label: '布局 Flex(已废弃)',
     component: () => import('@components/flex/__demo__/TheIndex.vue'),
   },
   {
-- 
Gitee


From 36caebc1554a5434af0481bf42cc641e3b19a529 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 15:52:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20#I8O0ZS=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89=EF=BC=8C=E5=9C=A8=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=88=A0=E9=99=A4=E9=A1=B9=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91change=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/select/OSelect.vue                | 3 +++
 .../opendesign/src/select/__demo__/SelectMultiple.vue     | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/opendesign/src/select/OSelect.vue b/packages/opendesign/src/select/OSelect.vue
index 08fc2f4a..9e8dad8a 100644
--- a/packages/opendesign/src/select/OSelect.vue
+++ b/packages/opendesign/src/select/OSelect.vue
@@ -197,6 +197,9 @@ const onRemoveTag = (value: string | number, e: MouseEvent) => {
   const idx = valueList.value.indexOf(value);
   if (idx > -1) {
     valueList.value.splice(idx, 1);
+
+    emits('change', [...valueList.value]);
+    emits('update:modelValue', [...valueList.value]);
   }
 };
 const onFoldTagClick = (e: MouseEvent) => {
diff --git a/packages/opendesign/src/select/__demo__/SelectMultiple.vue b/packages/opendesign/src/select/__demo__/SelectMultiple.vue
index 62499998..dde0b68f 100644
--- a/packages/opendesign/src/select/__demo__/SelectMultiple.vue
+++ b/packages/opendesign/src/select/__demo__/SelectMultiple.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { OSelect, SelectOptionT } from '../index';
+import { OSelect, SelectOptionT, SelectValueT } from '../index';
 import { OOption } from '../../option';
 import { ref } from 'vue';
 const options = [
@@ -18,11 +18,15 @@ const val = ref(['1', '4', '3', '5']);
 const exceededLabel = (tags: SelectOptionT[]) => {
   return tags.map((item) => item.label).join(',');
 };
+
+const onChange = (value: SelectValueT) => {
+  console.log(value);
+};
 </script>
 <template>
   <h3>多选</h3>
   <section>
-    <OSelect v-model="val" placeholder="多选" style="width: 240px" multiple :max-tag-count="3">
+    <OSelect v-model="val" placeholder="多选" style="width: 240px" multiple :max-tag-count="3" @change="onChange">
       <OOption v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled">++{{ item.label }}++</OOption>
     </OSelect>
     <OSelect v-model="val" placeholder="多选" style="width: 240px" multiple size="large" :max-tag-count="2" :fold-label="exceededLabel">
-- 
Gitee


From eb5aaadc7a1feb48c292a9588d78ef8d83dda8bb Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 16:07:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dclear?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E8=A7=A6=E5=8F=91change=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/select/OSelect.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/opendesign/src/select/OSelect.vue b/packages/opendesign/src/select/OSelect.vue
index 9e8dad8a..7a0c5946 100644
--- a/packages/opendesign/src/select/OSelect.vue
+++ b/packages/opendesign/src/select/OSelect.vue
@@ -123,6 +123,9 @@ const clearClick = (e: Event) => {
 
   valueList.value = [];
   emits('clear', e);
+
+  emits('change', [...valueList.value]);
+  emits('update:modelValue', [...valueList.value]);
 };
 const beforeSelect = async (value: string | number) => {
   if (isFunction(props.beforeSelect)) {
-- 
Gitee


From 81b0298741cff5a9dc0cd30bd1d812b97a7e3b35 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Wed, 13 Dec 2023 16:08:13 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A=E6=99=9A=E4=B8=8A=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/select/__demo__/SelectBasic.vue          | 16 ++++++++++------
 .../src/select/__demo__/SelectMultiple.vue       |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/opendesign/src/select/__demo__/SelectBasic.vue b/packages/opendesign/src/select/__demo__/SelectBasic.vue
index e67c1c94..28bf9c20 100644
--- a/packages/opendesign/src/select/__demo__/SelectBasic.vue
+++ b/packages/opendesign/src/select/__demo__/SelectBasic.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { OSelect } from '../index';
+import { OSelect, SelectValueT } from '../index';
 import { OOption } from '../../option';
 const options = [
   { label: 'option 1', value: 'opt1' },
@@ -23,13 +23,17 @@ const selectVal1 = ref('opt1');
 const changeVal = () => {
   selectVal1.value = 'opt3';
 };
+
+const onChange = (value: SelectValueT) => {
+  console.log(value);
+};
 </script>
 <template>
   <h4>Color & Variant</h4>
   <section>
     <div @click="changeVal">Text</div>
     <div class="row">
-      <OSelect v-model="selectVal1" variant="text" placeholder="normal + outline" loading>
+      <OSelect v-model="selectVal1" variant="text" placeholder="normal + outline">
         <OOption v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </OSelect>
       <OSelect v-model="selectVal1" variant="text" color="success" placeholder="normal + success" option-title="请选择">
@@ -44,16 +48,16 @@ const changeVal = () => {
     </div>
     <div @click="changeVal">Outline</div>
     <div class="row">
-      <OSelect v-model="selectVal1" placeholder="normal + outline" loading>
+      <OSelect v-model="selectVal1" placeholder="normal + outline" loading @change="onChange">
         <OOption v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </OSelect>
-      <OSelect v-model="selectVal1" color="success" placeholder="normal + success">
+      <OSelect v-model="selectVal1" color="success" placeholder="normal + success" clearable @change="onChange">
         <OOption v-for="item in options2" :key="item.value" :label="item.label" :value="item.value" />
       </OSelect>
-      <OSelect v-model="selectVal1" color="warning" placeholder="normal + warning">
+      <OSelect v-model="selectVal1" color="warning" placeholder="normal + warning" @change="onChange">
         <OOption v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </OSelect>
-      <OSelect v-model="selectVal1" color="danger" placeholder="normal + danger">
+      <OSelect v-model="selectVal1" color="danger" placeholder="normal + danger" @change="onChange">
         <OOption v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </OSelect>
     </div>
diff --git a/packages/opendesign/src/select/__demo__/SelectMultiple.vue b/packages/opendesign/src/select/__demo__/SelectMultiple.vue
index dde0b68f..54804a53 100644
--- a/packages/opendesign/src/select/__demo__/SelectMultiple.vue
+++ b/packages/opendesign/src/select/__demo__/SelectMultiple.vue
@@ -26,7 +26,7 @@ const onChange = (value: SelectValueT) => {
 <template>
   <h3>多选</h3>
   <section>
-    <OSelect v-model="val" placeholder="多选" style="width: 240px" multiple :max-tag-count="3" @change="onChange">
+    <OSelect v-model="val" placeholder="多选" style="width: 240px" multiple :max-tag-count="3" clearable @change="onChange">
       <OOption v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled">++{{ item.label }}++</OOption>
     </OSelect>
     <OSelect v-model="val" placeholder="多选" style="width: 240px" multiple size="large" :max-tag-count="2" :fold-label="exceededLabel">
-- 
Gitee