From 515535041cdb5dbd096db7f71a8ed63587b4f16d Mon Sep 17 00:00:00 2001
From: "jlj05024111@163.com" <jlj05024111@163.com>
Date: Sat, 21 Dec 2024 16:15:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0USER=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=97=A5=E5=8E=86=E6=A0=B9=E6=8D=AEuserSelectDate?=
 =?UTF-8?q?=E6=9D=A5=E7=BB=98=E5=88=B6=E4=B8=80=E5=91=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=8B=E6=9D=A5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=91=E6=A8=A1=E5=BC=8F=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8F=AF=E5=A1=AB=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/control/calendar/calendar.tsx                  |  1 +
 .../components/custom-calendar/custom-calendar.tsx |  2 +-
 .../components/interface/custom-calendar.ts        |  4 ++++
 .../dropdown-list-editor.controller.ts             | 14 ++++++++++++++
 .../dropdown-list/ibiz-dropdown/ibiz-dropdown.scss |  9 +++++++++
 .../dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx  |  6 ++++++
 6 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/control/calendar/calendar.tsx b/src/control/calendar/calendar.tsx
index 5e6d25e92..7468d1f57 100644
--- a/src/control/calendar/calendar.tsx
+++ b/src/control/calendar/calendar.tsx
@@ -524,6 +524,7 @@ export const CalendarControl = defineComponent({
         <div class={this.ns.b('content')}>
           <CustomCalendar
             v-model={this.c.state.selectedDate}
+            userSelectDate={this.c.state.userSelectDate}
             showDetail={this.c.state.showDetail}
             calendarTitle={this.c.state.calendarTitle}
             ref='calendarRef'
diff --git a/src/control/calendar/components/custom-calendar/custom-calendar.tsx b/src/control/calendar/components/custom-calendar/custom-calendar.tsx
index 223610d8b..0376d446d 100644
--- a/src/control/calendar/components/custom-calendar/custom-calendar.tsx
+++ b/src/control/calendar/components/custom-calendar/custom-calendar.tsx
@@ -205,7 +205,7 @@ export const CustomCalendar = defineComponent({
     const renderUser = () => {
       return (
         <CalendarUser
-          selected-day={realSelectedDay.value}
+          selected-day={props.userSelectDate}
           events={events.value}
           onEventClick={(value: IParams) => handleEVentClick(value)}
           onEventDblClick={(value: IParams) => handleEVentDblClick(value)}
diff --git a/src/control/calendar/components/interface/custom-calendar.ts b/src/control/calendar/components/interface/custom-calendar.ts
index c90f64915..c4134b205 100644
--- a/src/control/calendar/components/interface/custom-calendar.ts
+++ b/src/control/calendar/components/interface/custom-calendar.ts
@@ -28,6 +28,10 @@ const isValidRange = (range: IData): range is [Date, Date] =>
   range.every((item: Date) => isDate(item));
 
 const customCalendarProps = handleProps({
+  // user模式选中值
+  userSelectDate: {
+    type: Date,
+  },
   // 标题
   calendarTitle: {
     type: String,
diff --git a/src/editor/dropdown-list/dropdown-list-editor.controller.ts b/src/editor/dropdown-list/dropdown-list-editor.controller.ts
index 23bc77207..fcfae55c3 100644
--- a/src/editor/dropdown-list/dropdown-list-editor.controller.ts
+++ b/src/editor/dropdown-list/dropdown-list-editor.controller.ts
@@ -24,6 +24,13 @@ export class DropDownListEditorController extends CodeListEditorController<IDrop
    */
   public forceSelection = true;
 
+  /**
+   * 默认选中第一个
+   *
+   * @memberof CustomTagSelectController
+   */
+  public defaultFirstOption = false;
+
   /**
    * 预置项空白项名称
    *
@@ -37,10 +44,17 @@ export class DropDownListEditorController extends CodeListEditorController<IDrop
       this.multiple = true;
     }
 
+    // 传递false就可选可填了，默认只能选择已有的选项
     if (this.editorParams?.forceSelection) {
       this.forceSelection = this.toBoolean(this.editorParams.forceSelection);
     }
 
+    if (this.editorParams?.defaultFirstOption) {
+      this.defaultFirstOption = this.toBoolean(
+        this.editorParams.defaultFirstOption,
+      );
+    }
+
     if (this.editorParams?.blankItemName) {
       this.blankItemName = this.editorParams.blankItemName;
     }
diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
index a84de83c8..77a5f478a 100644
--- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
+++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.scss
@@ -275,4 +275,13 @@ $dropdown-readonly-text-item: (
       border-radius: getCssVar('spacing', 'base');
     }
   }
+  @include when('allow-create'){
+    .el-tree__empty-block{
+      display: none;
+    }
+
+    .el-select-dropdown__item{
+      padding-left: getCssVar(spacing,base-tight);
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx
index 30c15402c..70dfe92b8 100644
--- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx
+++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx
@@ -500,6 +500,8 @@ export const IBizDropdown = defineComponent({
         filterable={true}
         teleported={!this.showFormDefaultContent}
         data={this.treeNodes}
+        allow-create={!this.c.forceSelection}
+        default-first-option={this.c.defaultFirstOption}
         check-strictly
         render-after-expand={true}
         multiple={this.c.multiple}
@@ -511,6 +513,10 @@ export const IBizDropdown = defineComponent({
         onFocus={this.onFocus}
         onKeyup={this.handleKeyUp}
         onVisibleChange={this.onVisibleChange}
+        popper-class={`${this.ns.b('popper')} ${this.ns.is(
+          'allow-create',
+          !this.c.forceSelection,
+        )}`}
         props={{
           class: this.customNodeClass,
         }}
-- 
Gitee