From db056243d76f4de50c9ac4936057bd13bfbd4bdc Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 05 Jan 2022 14:06:01 +0800
Subject: [PATCH] 完善公共样式

---
 forms/select/CSelect.vue |  101 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/forms/select/CSelect.vue b/forms/select/CSelect.vue
index d68e2b9..9270195 100644
--- a/forms/select/CSelect.vue
+++ b/forms/select/CSelect.vue
@@ -5,35 +5,49 @@
 
 <template>
     <view class="c-select">
-        <picker
+        <!-- 下拉选择模式 -->
+        <view
             v-if="!selectByPage"
-            mode="selector"
-            :range="options"
-            :value="current"
-            range-key="name"
-            @change="evt=>handleChange(evt.detail)"
+            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 class="at-icon at-icon-chevron-right" />
+                </AtInput>
+            </picker>
+            <view class="c-select-slot">
+                <slot />
+            </view>
+        </view>
+        <!-- 跳转页面模式 -->
+        <view
+            v-else-if="selectByPage.length > 5"
+            @tap="evt => onGoToSelectorPage()"
         >
             <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 v-else-if="selectByPage.length > 5">
-            <AtInput
-                :name="itemRes.name"
-                :title="itemRes.label"
-                :required="itemRes.required"
-                :error="itemRes.error"
-                :placeholder="placeholder"
-                :value="selected"
-                :onFocus="evt=>onGoToSelectorPage()"
+                :value="choose.name"
             >
                 <view class="at-icon at-icon-chevron-right" />
             </AtInput>
@@ -44,6 +58,7 @@
 <script>
 import Taro from '@tarojs/taro';
 import { AtInput } from 'taro-ui-vue';
+import { $pagePoster } from '@components/common/PagePoster';
 import './cSelect.scss';
 
 export default {
@@ -52,14 +67,24 @@
         AtInput,
     },
     props: {
-        options: Array,
-        placeholder: String,
+        // 表单数据资源(表单组件内部机制专用)
         itemRes: Object,
+        // 选择菜单选项(浮窗模式)
+        options: Array,
+        // 占位提示
+        placeholder: String,
+        // 开启选择菜单跳转选择页面模式,并指定功能页面
         selectByPage: String,
+        // 页面模式下,选择完成后的回调
         onSelectFromPage: Function,
     },
     data() {
-        return {};
+        return {
+            choose: {
+                name: '',
+                value: null,
+            },
+        };
     },
     computed: {
         optionKey() {
@@ -90,16 +115,28 @@
             this.itemRes.onChange(item[this.optionKey]);
         },
         onGoToSelectorPage() {
-            Taro.navigateTo({
-                url: this.selectByPage,
-                events: {
-                    'CSelect:onSelected': data => {
-                        this.onSelectFromPage(data);
-                    },
-                },
+            let url = this.selectByPage;
+            if (this.selectByPage.indexOf('?') > 0) {
+                url += '&mode=CSelect';
+            } else {
+                url += '?mode=CSelect';
+            }
+            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