widget.qw 1.0.35 → 1.0.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "widget.qw",
   "private": false,
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "marqstree Vue3组件库",
   "main": "build/widget.qw.es.js",
   "keywords": [

package/src/components/data_selector.vue

@@ -6,7 +6,7 @@
       type="textarea"
       rows="1"
       autosize
-      :modelValue="selectedItems" 
+      :modelValue="selectdItemsLabel" 
       readonly  
       clearable 
       :required="isRequired" 
@@ -29,12 +29,12 @@
         <!-- 搜索框 -->
         <van-field left-icon="search" v-model.trim="searchKeyword" clearable placeholder="请输入搜索关键字" />
         <!-- 全选 -->
-        <div v-if="mode === 'multiple'" class="select-all-container">
+        <div v-if="props.multiple" class="select-all-container">
           <van-checkbox shape="square" v-model="isAllChecked" @click="toggleAllSelect" label-position="left">全选</van-checkbox>
         </div>
         <!-- 数据列表 -->
         <div class="checkbox-style">
-          <van-checkbox-group v-model="checkedValue" v-if="mode === 'multiple'">
+          <van-checkbox-group v-model="checkedValue" v-if="props.multiple">
             <van-cell-group>
               <van-cell v-for="(item, index) in filteredColumns" :key="index" :title="item.text" clickable
                 @click="toggle(index)">
@@ -72,18 +72,16 @@ import { onMounted, ref, onBeforeUpdate, computed, nextTick, watch } from "vue"
 import util from '../util'
 
 const props = defineProps({
-  mode: {
-    type: String,
-    default: 'multiple', // 'single' | 'multiple'
-    validator: (v) => ['single', 'multiple'].includes(v)
+  multiple:{
+    type:Boolean,
+    default:false
   },
   options: {
     type: Array,
     required: true,
   },
   modelValue: {
-    type: [Array, String, Number],
-    default: () => [],
+    type: [Array, String, Number]
   },
   rules: {
     type: Array,
@@ -109,6 +107,12 @@ const {isRequired, isReadonly, isGone,isDisabled} = util.props2auth(props)
 const emit = defineEmits(["update:modelValue","select"]);
 
 const selectedItems = ref([]);
+const selectdItemsLabel = computed(()=>{
+  if(!selectedItems.value)
+    return ''
+
+  return selectedItems.value.join(',')
+})
 const popupVisible = ref(false);
 const searchKeyword = ref(null);
 const checkboxRefs = ref([]);
@@ -133,7 +137,7 @@ const values2items = (values)=>{
 const reShow = () => {
   if (props.modelValue) {
     if (Array.isArray(props.options)) {
-      if (props.mode === 'multiple') {
+      if (props.multiple) {
         selectedItems.value = findTextsByValues(props.modelValue, props.options);
       } else {
         const foundItem = props.options.find((item) => item.value === props.modelValue);
@@ -162,7 +166,7 @@ const showPopup = () => {
   if (isReadonly.value) {
     return;
   }
-  if (props.mode === 'multiple') {
+  if (props.multiple) {
     checkedValue.value = Array.isArray(props.modelValue) ? props.modelValue : [];
   } else {
     checkedValue.value = props.modelValue;
@@ -175,7 +179,7 @@ const cancelSelection = () => {
 };
 
 const confirmSelection = () => {
-  if (props.mode === 'multiple') {
+  if (props.multiple) {
     selectedItems.value = findTextsByValues(checkedValue.value, props.options);
     emit("update:modelValue", checkedValue.value);
     emit("select",values2items(checkedValue.value))
@@ -207,7 +211,7 @@ const filteredColumns = computed(() => {
 });
 
 watch(checkedValue, () => {
-  if (props.mode === 'multiple') {
+  if (props.multiple) {
     if (filteredColumns.value.length === 0) {
       isAllChecked.value = false;
     } else {

package/src/views/dataSelector/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="page">
-        <widget-qw-data-selector :options="options" v-model="formData.singleSelect" mode="single" label="单选数据"
+        <widget-qw-data-selector :options="options" v-model="formData.singleSelect" label="单选数据"
             placeholder="单选数据" :auth="formData.auth" />
-        <widget-qw-data-selector :options="options" v-model="formData.multSelect" mode="multiple" label="多选数据"
+        <widget-qw-data-selector :options="options" v-model="formData.multSelect" multiple label="多选数据"
             placeholder="多选数据" :required="true" :readonly="false" />
     </div>
 </template>