From ed7b8cf8385263310f44b100e4d6e9f775ccb38c Mon Sep 17 00:00:00 2001
From: jixinbao <jixinbao@dcloud.io>
Date: Tue, 2 Jul 2024 14:32:22 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=90=8C=E6=AD=A5=20alpha=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/textarea/textarea.test.js |  17 +-
 pages/component/textarea/textarea.uvue    | 392 +++++++++++-----------
 2 files changed, 203 insertions(+), 206 deletions(-)

diff --git a/pages/component/textarea/textarea.test.js b/pages/component/textarea/textarea.test.js
index 8c985438..7a5cd7fe 100644
--- a/pages/component/textarea/textarea.test.js
+++ b/pages/component/textarea/textarea.test.js
@@ -64,7 +64,7 @@ describe('component-native-textarea', () => {
       var x = inputmodeEnum[i]
       console.log(x['value'], x['name'])
       var selected = x['value'] - 1
-      if(i == inputmodeEnum.length - 1){
+      if (i == inputmodeEnum.length - 1) {
         selected = i
       }
       await page.callMethod("radio_change_inputmode_enum", selected);
@@ -74,18 +74,10 @@ describe('component-native-textarea', () => {
     }
   })
 
-  if (!process.env.uniTestPlatformInfo.startsWith('android')) {
-    // TODO: 暂时规避 android 端测试
-    it('both set modelValue and value', async () => {
-      let textarea2 = await page.$('.both-set-textarea');
-      expect(await textarea2.value()).toBe("123")
-    })
-  }
-
   it("maxlength", async () => {
     const input = await page.$('#textarea-instance-maxlength');
     let str = "";
-    for(let i = 0;i < 200;i++){
+    for (let i = 0; i < 200; i++) {
       str += `${i}`
     }
     await page.setData({
@@ -98,4 +90,9 @@ describe('component-native-textarea', () => {
     })
   })
 
+  it('both set modelValue and value', async () => {
+    const textarea2 = await page.$('#both-model-value');
+    expect(await textarea2.value()).toEqual("123")
+  })
+
 });
diff --git a/pages/component/textarea/textarea.uvue b/pages/component/textarea/textarea.uvue
index 81ac3d87..136ff728 100644
--- a/pages/component/textarea/textarea.uvue
+++ b/pages/component/textarea/textarea.uvue
@@ -1,197 +1,197 @@
-<script>
-  import { ItemType } from '@/components/enum-data/enum-data'
-  export default {
-    data() {
-      return {
-        adjust_position_boolean: false,
-        show_confirm_bar_boolean: false,
-        fixed_boolean: false,
-        auto_height_boolean: false,
-        confirm_hold_boolean: false,
-        focus_boolean: true,
-        auto_focus_boolean: false,
-        default_value: "1\n2\n3\n4\n5\n6",
-        inputmode_enum: [{ "value": 1, "name": "text" }, { "value": 2, "name": "decimal" }, { "value": 3, "name": "numeric" }, { "value": 4, "name": "tel" }, { "value": 5, "name": "search" }, { "value": 6, "name": "email" }, { "value": 7, "name": "url" }, { "value": 0, "name": "none" }] as ItemType[],
-        confirm_type_list: [{ "value": 0, "name": "return" }, { "value": 1, "name": "done" }, { "value": 2, "name": "send" }, { "value": 3, "name": "search" }, { "value": 4, "name": "next" }, { "value": 5, "name": "go" }] as ItemType[],
-        cursor_color: "#3393E2",
-        cursor: 0,
-        inputmode_enum_current: 0,
-        confirm_type_current: 0,
-        placeholder_value: "请输入",
-        defaultModel: '123',
-        textareaMaxLengthValue: "",
-        selectionStart: -1,
-        selectionEnd: -1,
-        hold_keyboard: false,
-        adjust_position: false
-      }
-    },
-
-    methods: {
-      textarea_click() { console.log("组件被点击时触发") },
-      textarea_touchstart() { console.log("手指触摸动作开始") },
-      textarea_touchmove() { console.log("手指触摸后移动") },
-      textarea_touchcancel() { console.log("手指触摸动作被打断，如来电提醒，弹窗") },
-      textarea_touchend() { console.log("手指触摸动作结束") },
-      textarea_tap() { console.log("手指触摸后马上离开") },
-      textarea_longpress() { console.log("如果一个组件被绑定了 longpress 事件，那么当用户长按这个组件时，该事件将会被触发。") },
-      textarea_confirm() { console.log("点击完成时， 触发 confirm 事件，event.detail = {value: value}") },
-      textarea_input() { console.log("当键盘输入时，触发 input 事件，event.detail = {value, cursor}， @input 处理函数的返回值并不会反映到 textarea 上") },
-      textarea_linechange() { console.log("输入框行数变化时调用，event.detail = {height: 0, height: 0, lineCount: 0}") },
-      textarea_blur() { console.log("输入框失去焦点时触发，event.detail = {value, cursor}") },
-      textarea_keyboardheightchange() { console.log("键盘高度发生变化的时候触发此事件，event.detail = {height: height, duration: duration}") },
-      textarea_focus() { console.log("输入框聚焦时触发，event.detail = { value, height }，height 为键盘高度") },
-      change_adjust_position_boolean(checked : boolean) { this.adjust_position_boolean = checked },
-      change_show_confirm_bar_boolean(checked : boolean) { this.show_confirm_bar_boolean = checked },
-      change_fixed_boolean(checked : boolean) { this.fixed_boolean = checked },
-      change_auto_height_boolean(checked : boolean) { this.auto_height_boolean = checked },
-      change_confirm_hold_boolean(checked : boolean) { this.confirm_hold_boolean = checked },
-      change_focus_boolean(checked : boolean) { this.focus_boolean = checked },
-      change_auto_focus_boolean(checked : boolean) { this.auto_focus_boolean = checked },
-      change_cursor_color_boolean(checked : boolean) { if (checked) { this.cursor_color = "transparent" } else { this.cursor_color = "#3393E2" } },
-      radio_change_inputmode_enum(checked : number) { this.inputmode_enum_current = checked },
-      radio_change_confirm_type(checked : number) { this.confirm_type_current = checked },
-      setSelection: function (selectionStart : number, selectionEnd : number) {
-        uni.getElementById("textarea-instance-2")?.focus()
-        this.selectionStart = selectionStart;
-        this.selectionEnd = selectionEnd;
-      },
-      onSelectionBlurChange() {
-        this.selectionEnd = 0;
-      },
-      changeHoldKeyboard(event : UniSwitchChangeEvent) {
-        const checked = event.detail.value;
-        this.hold_keyboard = checked;
-      },
-      changeAdjustPosition(event : UniSwitchChangeEvent) {
-        const checked = event.detail.value;
-        this.adjust_position = checked;
-      }
-    }
-  }
-</script>
-
-<template>
-  <!-- #ifdef APP -->
-  <scroll-view style="flex: 1">
-  <!-- #endif -->
-    <view class="main">
-      <textarea :value="default_value" class="uni-textarea" :auto-focus="true" :focus="focus_boolean"
-        :confirm-hold="confirm_hold_boolean" :auto-height="auto_height_boolean" :fixed="fixed_boolean"
-        :show-confirm-bar="show_confirm_bar_boolean" :adjust-position="adjust_position_boolean"
-        :cursor-color="cursor_color" :cursor="cursor" :placeholder="placeholder_value"
-        :inputmode="inputmode_enum[inputmode_enum_current].name"
-        :confirm-type="confirm_type_list[confirm_type_current].name" @click="textarea_click"
-        @touchstart="textarea_touchstart" @touchmove="textarea_touchmove" @touchcancel="textarea_touchcancel"
-        @touchend="textarea_touchend" @tap="textarea_tap" @longpress="textarea_longpress" @confirm="textarea_confirm"
-        @input="textarea_input" @linechange="textarea_linechange" @blur="textarea_blur"
-        @keyboardheightchange="textarea_keyboardheightchange" @focus="textarea_focus"
-        style="padding: 10px; border: 1px solid #666;height: 200px" />
-    </view>
-    <view class="content">
-      <boolean-data :defaultValue="false" title="键盘弹起时，是否自动上推页面（限非 Web 平台）"
-        @change="change_adjust_position_boolean"></boolean-data>
-      <boolean-data :defaultValue="false" title="是否自动增高，设置auto-height时，style.height不生效"
-        @change="change_auto_height_boolean"></boolean-data>
-      <boolean-data :defaultValue="focus_boolean" title="获取焦点" @change="change_focus_boolean"></boolean-data>
-      <boolean-data :defaultValue="true" title="首次自动获取焦点" @change="change_auto_focus_boolean"></boolean-data>
-      <boolean-data :defaultValue="false" title="改变光标颜色为透明" @change="change_cursor_color_boolean"></boolean-data>
-      <enum-data :items="confirm_type_list" title="confirm-type，设置键盘右下角按钮。（Android仅支持return）"
-        @change="radio_change_confirm_type"></enum-data>
-      <boolean-data :defaultValue="false" title="点击软键盘右下角按钮时是否保持键盘不收起(confirm-type为return时必然不收起)"
-        @change="change_confirm_hold_boolean"></boolean-data>
-      <enum-data :items="inputmode_enum" title="input-mode，控制软键盘类型。（仅限 Web 平台符合条件的高版本浏览器或webview）。"
-        @change="radio_change_inputmode_enum"></enum-data>
-      <boolean-data :defaultValue="false" title="是否显示键盘上方带有“完成”按钮那一栏（仅限小程序平台）"
-        @change="change_show_confirm_bar_boolean"></boolean-data>
-      <boolean-data :defaultValue="false" title="如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true（仅限小程序平台）"
-        @change="change_fixed_boolean"></boolean-data>
-
-
-      <view class="title-wrap">
-        <view>maxlength 输入最大长度为10</view>
-      </view>
-      <view class="textarea-wrap">
-        <textarea id="textarea-instance-maxlength" class="textarea-instance" :value="textareaMaxLengthValue"
-          :maxlength="10" />
-      </view>
-
-      <view class="title-wrap">
-        <view>cursor-spacing、placeholder-class、placeholder-style例子</view>
-      </view>
-      <view class="textarea-wrap">
-        <textarea id="textarea-height-exception" class="textarea-instance" placeholder="底部textarea测试键盘遮挡"
-          placeholder-class="placeholder" placeholder-style="background-color:red" :cursor-spacing="300" />
-      </view>
-      <view class="title-wrap">
-        <view>同时存在 v-model 和 value</view>
-      </view>
-      <view class="textarea-wrap">
-        <textarea class="textarea-instance" v-model='defaultModel' value='456'></textarea>
-      </view>
-
-      <view class="title-wrap">
-        <view @click="setSelection(2, 5)">设置输入框聚焦时光标的起始位置和结束位置（点击生效）</view>
-      </view>
-      <view class="textarea-wrap">
-        <textarea id="textarea-instance-2" class="textarea-instance" value="Hello UniApp X Textarea TestCase"
-          :selection-start="selectionStart" :selection-end="selectionEnd" @blur="onSelectionBlurChange" />
-      </view>
-
-      <view class="title-wrap">
-        <view>设置hold-keyboard</view>
-        <switch style="margin-left: 10px;" @change="changeHoldKeyboard" :checked="hold_keyboard"></switch>
-      </view>
-      <view class="textarea-wrap">
-        <textarea class="textarea-instance" :hold-keyboard="hold_keyboard" />
-      </view>
-
-      <view class="title-wrap">
-        <view>设置adjust-position</view>
-        <switch style="margin-left: 10px;" @change="changeAdjustPosition" :checked="adjust_position"></switch>
-      </view>
-      <view class="textarea-wrap">
-        <textarea class="textarea-instance" :adjust-position="adjust_position" />
-      </view>
-    </view>
-  <!-- #ifdef APP -->
-  </scroll-view>
-  <!-- #endif -->
-</template>
-
-<style>
-  .main {
-    min-height: 100px;
-    padding: 5px 0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.06);
-    flex-direction: row;
-    justify-content: center;
-  }
-
-  .main .list-item {
-    width: 100%;
-    height: 100px;
-    border: 1px solid #666;
-  }
-
-  .textarea-wrap {
-    flex-direction: row;
-    justify-content: center;
-  }
-
-  .title-wrap {
-    flex-direction: row;
-    align-items: center;
-    margin-left: 10px;
-  }
-
-  .textarea-instance {
-    flex: 1;
-    border: 1 solid #666;
-    margin: 10px;
-  }
-
-  .placeholder {
-    background-color: yellow;
-  }
+<script>
+  import { ItemType } from '@/components/enum-data/enum-data'
+  export default {
+    data() {
+      return {
+        adjust_position_boolean: false,
+        show_confirm_bar_boolean: false,
+        fixed_boolean: false,
+        auto_height_boolean: false,
+        confirm_hold_boolean: false,
+        focus_boolean: true,
+        auto_focus_boolean: false,
+        default_value: "1\n2\n3\n4\n5\n6",
+        inputmode_enum: [{ "value": 1, "name": "text" }, { "value": 2, "name": "decimal" }, { "value": 3, "name": "numeric" }, { "value": 4, "name": "tel" }, { "value": 5, "name": "search" }, { "value": 6, "name": "email" }, { "value": 7, "name": "url" }, { "value": 0, "name": "none" }] as ItemType[],
+        confirm_type_list: [{ "value": 0, "name": "return" }, { "value": 1, "name": "done" }, { "value": 2, "name": "send" }, { "value": 3, "name": "search" }, { "value": 4, "name": "next" }, { "value": 5, "name": "go" }] as ItemType[],
+        cursor_color: "#3393E2",
+        cursor: 0,
+        inputmode_enum_current: 0,
+        confirm_type_current: 0,
+        placeholder_value: "请输入",
+        defaultModel: '123',
+        textareaMaxLengthValue: "",
+        selectionStart: -1,
+        selectionEnd: -1,
+        hold_keyboard: false,
+        adjust_position: false
+      }
+    },
+
+    methods: {
+      textarea_click() { console.log("组件被点击时触发") },
+      textarea_touchstart() { console.log("手指触摸动作开始") },
+      textarea_touchmove() { console.log("手指触摸后移动") },
+      textarea_touchcancel() { console.log("手指触摸动作被打断，如来电提醒，弹窗") },
+      textarea_touchend() { console.log("手指触摸动作结束") },
+      textarea_tap() { console.log("手指触摸后马上离开") },
+      textarea_longpress() { console.log("如果一个组件被绑定了 longpress 事件，那么当用户长按这个组件时，该事件将会被触发。") },
+      textarea_confirm() { console.log("点击完成时， 触发 confirm 事件，event.detail = {value: value}") },
+      textarea_input() { console.log("当键盘输入时，触发 input 事件，event.detail = {value, cursor}， @input 处理函数的返回值并不会反映到 textarea 上") },
+      textarea_linechange() { console.log("输入框行数变化时调用，event.detail = {height: 0, height: 0, lineCount: 0}") },
+      textarea_blur() { console.log("输入框失去焦点时触发，event.detail = {value, cursor}") },
+      textarea_keyboardheightchange() { console.log("键盘高度发生变化的时候触发此事件，event.detail = {height: height, duration: duration}") },
+      textarea_focus() { console.log("输入框聚焦时触发，event.detail = { value, height }，height 为键盘高度") },
+      change_adjust_position_boolean(checked : boolean) { this.adjust_position_boolean = checked },
+      change_show_confirm_bar_boolean(checked : boolean) { this.show_confirm_bar_boolean = checked },
+      change_fixed_boolean(checked : boolean) { this.fixed_boolean = checked },
+      change_auto_height_boolean(checked : boolean) { this.auto_height_boolean = checked },
+      change_confirm_hold_boolean(checked : boolean) { this.confirm_hold_boolean = checked },
+      change_focus_boolean(checked : boolean) { this.focus_boolean = checked },
+      change_auto_focus_boolean(checked : boolean) { this.auto_focus_boolean = checked },
+      change_cursor_color_boolean(checked : boolean) { if (checked) { this.cursor_color = "transparent" } else { this.cursor_color = "#3393E2" } },
+      radio_change_inputmode_enum(checked : number) { this.inputmode_enum_current = checked },
+      radio_change_confirm_type(checked : number) { this.confirm_type_current = checked },
+      setSelection: function (selectionStart : number, selectionEnd : number) {
+        uni.getElementById("textarea-instance-2")?.focus()
+        this.selectionStart = selectionStart;
+        this.selectionEnd = selectionEnd;
+      },
+      onSelectionBlurChange() {
+        this.selectionEnd = 0;
+      },
+      changeHoldKeyboard(event : UniSwitchChangeEvent) {
+        const checked = event.detail.value;
+        this.hold_keyboard = checked;
+      },
+      changeAdjustPosition(event : UniSwitchChangeEvent) {
+        const checked = event.detail.value;
+        this.adjust_position = checked;
+      }
+    }
+  }
+</script>
+
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
+    <view class="main">
+      <textarea :value="default_value" class="uni-textarea" :auto-focus="true" :focus="focus_boolean"
+        :confirm-hold="confirm_hold_boolean" :auto-height="auto_height_boolean" :fixed="fixed_boolean"
+        :show-confirm-bar="show_confirm_bar_boolean" :adjust-position="adjust_position_boolean"
+        :cursor-color="cursor_color" :cursor="cursor" :placeholder="placeholder_value"
+        :inputmode="inputmode_enum[inputmode_enum_current].name"
+        :confirm-type="confirm_type_list[confirm_type_current].name" @click="textarea_click"
+        @touchstart="textarea_touchstart" @touchmove="textarea_touchmove" @touchcancel="textarea_touchcancel"
+        @touchend="textarea_touchend" @tap="textarea_tap" @longpress="textarea_longpress" @confirm="textarea_confirm"
+        @input="textarea_input" @linechange="textarea_linechange" @blur="textarea_blur"
+        @keyboardheightchange="textarea_keyboardheightchange" @focus="textarea_focus"
+        style="padding: 10px; border: 1px solid #666;height: 200px" />
+    </view>
+    <view class="content">
+      <boolean-data :defaultValue="false" title="键盘弹起时，是否自动上推页面（限非 Web 平台）"
+        @change="change_adjust_position_boolean"></boolean-data>
+      <boolean-data :defaultValue="false" title="是否自动增高，设置auto-height时，style.height不生效"
+        @change="change_auto_height_boolean"></boolean-data>
+      <boolean-data :defaultValue="focus_boolean" title="获取焦点" @change="change_focus_boolean"></boolean-data>
+      <boolean-data :defaultValue="true" title="首次自动获取焦点" @change="change_auto_focus_boolean"></boolean-data>
+      <boolean-data :defaultValue="false" title="改变光标颜色为透明" @change="change_cursor_color_boolean"></boolean-data>
+      <enum-data :items="confirm_type_list" title="confirm-type，设置键盘右下角按钮。（Android仅支持return）"
+        @change="radio_change_confirm_type"></enum-data>
+      <boolean-data :defaultValue="false" title="点击软键盘右下角按钮时是否保持键盘不收起(confirm-type为return时必然不收起)"
+        @change="change_confirm_hold_boolean"></boolean-data>
+      <enum-data :items="inputmode_enum" title="input-mode，控制软键盘类型。（仅限 Web 平台符合条件的高版本浏览器或webview）。"
+        @change="radio_change_inputmode_enum"></enum-data>
+      <boolean-data :defaultValue="false" title="是否显示键盘上方带有“完成”按钮那一栏（仅限小程序平台）"
+        @change="change_show_confirm_bar_boolean"></boolean-data>
+      <boolean-data :defaultValue="false" title="如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true（仅限小程序平台）"
+        @change="change_fixed_boolean"></boolean-data>
+
+
+      <view class="title-wrap">
+        <view>maxlength 输入最大长度为10</view>
+      </view>
+      <view class="textarea-wrap">
+        <textarea id="textarea-instance-maxlength" class="textarea-instance" :value="textareaMaxLengthValue"
+          :maxlength="10" />
+      </view>
+
+      <view class="title-wrap">
+        <view>cursor-spacing、placeholder-class、placeholder-style例子</view>
+      </view>
+      <view class="textarea-wrap">
+        <textarea id="textarea-height-exception" class="textarea-instance" placeholder="底部textarea测试键盘遮挡"
+          placeholder-class="placeholder" placeholder-style="background-color:red" :cursor-spacing="300" />
+      </view>
+      <view class="title-wrap">
+        <view @click="setSelection(2, 5)">设置输入框聚焦时光标的起始位置和结束位置（点击生效）</view>
+      </view>
+      <view class="textarea-wrap">
+        <textarea id="textarea-instance-2" class="textarea-instance" value="Hello UniApp X Textarea TestCase"
+          :selection-start="selectionStart" :selection-end="selectionEnd" @blur="onSelectionBlurChange" />
+      </view>
+
+      <view class="title-wrap">
+        <view>设置hold-keyboard</view>
+        <switch style="margin-left: 10px;" @change="changeHoldKeyboard" :checked="hold_keyboard"></switch>
+      </view>
+      <view class="textarea-wrap">
+        <textarea class="textarea-instance" :hold-keyboard="hold_keyboard" />
+      </view>
+
+      <view class="title-wrap">
+        <view>同时存在 v-model 和 value</view>
+      </view>
+      <view class="textarea-wrap">
+        <textarea id="both-model-value" class="textarea-instance" v-model='defaultModel' value='456'></textarea>
+      </view>
+
+      <view class="title-wrap">
+        <view>设置adjust-position</view>
+        <switch style="margin-left: 10px;" @change="changeAdjustPosition" :checked="adjust_position"></switch>
+      </view>
+      <view class="textarea-wrap">
+        <textarea class="textarea-instance" :adjust-position="adjust_position" />
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+
+<style>
+  .main {
+    min-height: 100px;
+    padding: 5px 0;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+    flex-direction: row;
+    justify-content: center;
+  }
+
+  .main .list-item {
+    width: 100%;
+    height: 100px;
+    border: 1px solid #666;
+  }
+
+  .textarea-wrap {
+    flex-direction: row;
+    justify-content: center;
+  }
+
+  .title-wrap {
+    flex-direction: row;
+    align-items: center;
+    margin-left: 10px;
+  }
+
+  .textarea-instance {
+    flex: 1;
+    border: 1 solid #666;
+    margin: 10px;
+  }
+
+  .placeholder {
+    background-color: yellow;
+  }
 </style>
-- 
GitLab