From 5b15175432d0d03d6a35c4555b26d38720095c3a Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 16 May 2024 17:39:29 +0800
Subject: [PATCH] 列表页筛选组件,修复下拉选择取消项和值为0的项,显示异常的问题

---
 forms/select/CSelect.vue |  133 +++++++++++++++++++++++++++++---------------
 1 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/forms/select/CSelect.vue b/forms/select/CSelect.vue
index 07e4465..9c7a349 100644
--- a/forms/select/CSelect.vue
+++ b/forms/select/CSelect.vue
@@ -4,31 +4,47 @@
  */
 
 <template>
-    <view class="c-select">
-        <picker
-            v-if="!selectByPage"
-            mode="selector"
-            :range="options"
-            :value="current"
-            range-key="name"
-            @change="evt=>handleChange(evt.detail)"
-        >
-            <AtInput
-                ref="input"
-                :name="itemRes.name"
-                :title="itemRes.label"
-                :required="itemRes.required"
-                :disabled="itemRes.disabled"
-                :error="itemRes.error"
-                :placeholder="placeholder"
-                :value="selected"
-            >
-                <view class="at-icon at-icon-chevron-right" />
-            </AtInput>
-        </picker>
+    <view
+        class="c-select"
+        :class="readOnly?'read-only':''"
+    >
+        <!-- 下拉选择模式 -->
         <view
-            v-else-if="selectByPage.length > 5"
-            @tap="evt => onGoToSelectorPage()"
+            v-if="!selectByPage"
+            class="c-select-slot-mode"
+        >
+            <picker
+                class="c-select-input"
+                mode="selector"
+                :range="options"
+                :value="current"
+                range-key="name"
+                @change="evt=>handleChange(evt.detail)"
+            >
+                <AtInput
+                    ref="input"
+                    :name="itemRes.name"
+                    :title="itemRes.label"
+                    :required="itemRes.required"
+                    :disabled="itemRes.disabled"
+                    :error="itemRes.error"
+                    :placeholder="placeholder"
+                    :value="selected"
+                >
+                    <view
+                        v-show="!readOnly"
+                        class="at-icon at-icon-chevron-right"
+                    />
+                </AtInput>
+            </picker>
+            <view class="c-select-slot">
+                <slot />
+            </view>
+        </view>
+        <!-- 跳转页面模式 -->
+        <view
+            v-else-if="selectByPage.length > 5 || selectByPage === 'on'"
+            @tap="evt => onGoSelectorPage()"
         >
             <AtInput
                 :name="itemRes.name"
@@ -37,9 +53,12 @@
                 :disabled="itemRes.disabled"
                 :error="itemRes.error"
                 :placeholder="placeholder"
-                :value="chose.name"
+                :value="choose.name || selected"
             >
-                <view class="at-icon at-icon-chevron-right" />
+                <view
+                    v-show="!readOnly"
+                    class="at-icon at-icon-chevron-right"
+                />
             </AtInput>
         </view>
     </view>
@@ -48,6 +67,7 @@
 <script>
 import Taro from '@tarojs/taro';
 import { AtInput } from 'taro-ui-vue';
+import { $pagePoster } from '@components/common/PagePoster';
 import './cSelect.scss';
 
 export default {
@@ -62,14 +82,25 @@
         options: Array,
         // 占位提示
         placeholder: String,
-        // 开启选择菜单跳转选择页面模式,并指定功能页面
+        // 只读模式
+        readOnly: {
+            type: Boolean,
+            default: false,
+        },
+        // 开启选择菜单跳转选择页面模式,并指定功能页面,url or 'on'
+        //   url 模式已经废弃,即将删除代码,请勿再使用
         selectByPage: String,
-        // 页面模式下,选择完成后的回调
+        // 页面跳转URL模式下,选择完成后的回调
         onSelectFromPage: Function,
+        // 页面跳转on模式下,发起选择的回调
+        onOpenSelectorPage: Function,
     },
     data() {
         return {
-            chose: {},
+            choose: {
+                name: '',
+                value: null,
+            },
         };
     },
     computed: {
@@ -97,32 +128,42 @@
     },
     methods: {
         handleChange(evt) {
-            const item = this.options[evt.value];
-            this.itemRes.onChange(item[this.optionKey]);
+            if (typeof this.optionKey === 'undefined') {
+                this.itemRes.onChange();
+            } else {
+                const item = this.options[evt.value];
+                this.itemRes.onChange(item[this.optionKey]);
+            }
         },
-        onGoToSelectorPage() {
+        onGoSelectorPage() {
+            if (this.selectByPage === 'on') {
+                this.onOpenSelectorPage && this.onOpenSelectorPage();
+                return;
+            }
+            // 页面跳转URL模式,已废弃,即将删除代码
+            console.warn('CSelect:警告,url跳转已废弃,即将删除代码,请勿使用!');
             let url = this.selectByPage;
             if (this.selectByPage.indexOf('?') > 0) {
                 url += '&mode=CSelect';
             } else {
                 url += '?mode=CSelect';
             }
-            Taro.navigateTo({
-                url,
-                events: {
-                    'CSelect:onSelected': data => {
-                        const value = data.id || data.value || data.key;
-                        this.chose = {
-                            name: data.name,
-                            value,
-                        };
-                        this.itemRes.onChange(value);
-                        this.onSelectFromPage(data);
-                    },
-                },
+            if (this._eventor) {
+                // 销毁上次事件收发器
+                this._eventor.destroy();
+            }
+            this._eventor = $pagePoster.createEventor();
+            this._eventor.on('@linked', () => {
+                this._eventor.emit('lastValue', this.choose.value);
             });
+            this._eventor.on('selected', data => {
+                this.choose.name = data.name;
+                this.choose.value = data.value;
+                this.itemRes.onChange(data.value);
+                this.onSelectFromPage && this.onSelectFromPage(data.value);
+            });
+            Taro.navigateTo({ url: url + '&eventorId=' + this._eventor.id });
         },
     },
-    mounted() {},
 };
 </script>
\ No newline at end of file

--
Gitblit v1.9.1