widget.qw 1.0.89 → 1.0.91

package/package.json

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

package/src/components/CascaderPicker.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-field v-if="!isGone" :label="props.label" readonly :required="isRequired" :rules="props.rules"
+    <van-field v-if="!isGone" :label="props.label" readonly :required="isRequired" :rules="rules"
         :disabled="isDisabled" :placeholder="props.placeholder" :is-link="isReadonly ? false : true"
         @click="data.isShowPop = !isReadonly" label-class="label">
         <template #input v-if="modelValue">
@@ -79,7 +79,7 @@ const data = reactive({
 // 定义emit
 const emit = defineEmits(["update:modelValue", "select"]);
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 
 //首页加载
 onMounted(() => {

package/src/components/CheckGroup.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-field v-if="!isGone" :label="props.label" :required="isRequired" :rules="props.rules">
+    <van-field v-if="!isGone" :label="props.label" :required="isRequired" :rules="rules">
         <template #input>
             <van-checkbox-group v-model="modelValue" direction="vertical" :disabled="isDisabled">
                 <van-checkbox style="padding:5px 0;" v-for="(option, i) in totalOptions" :key="i" :name="option.code"
@@ -46,7 +46,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 const options = ref([])
 // 将初始化数据与配置项合并
 const totalOptions = computed(() => {

package/src/components/DatetimePicker.vue

@@ -4,7 +4,7 @@
         :readonly="isReadonly"
         readonly
         clearable
-        :placeholder="props.placeholder" :required="isRequired" :rules="props.rules"
+        :placeholder="props.placeholder" :required="isRequired" :rules="rules"
         :right-icon="rightIcon"
         @click-right-icon="onToggleShow">
     </van-field>
@@ -69,7 +69,7 @@ const props = defineProps({
 const data = reactive({
     isShow: false, //是否显示弹出层
 })
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 //定义要向父组件传递的事件
 const emit = defineEmits(["update:modelValue"])
 const modelValue = useVModel(props, "modelValue", emit)

package/src/components/FilePicker.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-field v-if="!isGone" name="image" :label="props.label" :required="isRequired" :rules="props.rules"
+    <van-field v-if="!isGone" name="image" :label="props.label" :required="isRequired" :rules="rules"
         label-class="label" :placeholder="props.placeholder">
         <template #input>
             <div class="file-box">
@@ -61,7 +61,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 
 const files = ref([])
 const maxCount = computed(() => {

package/src/components/Input.vue

@@ -1,10 +1,13 @@
 <template>
-    <van-field :label="props.label" v-model.number="modelValue" v-if="!isGone && props.type === 'number'"
+    <van-field 
+        :label="props.label" 
+        v-model.number="modelValue" 
+        v-if="!isGone && props.type === 'number'"
         :disabled="isDisabled" :required="isRequired" :placeholder="props.placeholder" :type="props.type"
-        :rows="props.rows" :autosize="props.autosize" :rules="props.rules" />
+        :rows="props.rows" :autosize="props.autosize" :rules="rules" />
     <van-field :label="props.label" v-model="modelValue" v-if="!isGone && props.type != 'number'" :disabled="isDisabled"
         :required="isRequired" :placeholder="props.placeholder" :type="props.type" :rows="props.rows"
-        :autosize="props.autosize" :rules="props.rules" />
+        :autosize="props.autosize" :rules="rules" />
 </template>
 
 <script setup>
@@ -61,7 +64,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 
 onMounted(() => {
 })

package/src/components/MultiPicker.vue

@@ -1,5 +1,5 @@
 <template>
-  <van-field v-if="!isGone" :label="props.label" :required="isRequired" :rules="props.rules" :disabled="isDisabled"
+  <van-field v-if="!isGone" :label="props.label" :required="isRequired" :rules="rules" :disabled="isDisabled"
     :placeholder="props.placeholder" :is-link="isReadonly ? false : true" @click="data.isShowPop = !isReadonly"
     label-class="label">
     <template #input v-if="selectOptions.length>0">
@@ -50,7 +50,7 @@ const props = defineProps({
   },
 });
 
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 const emit = defineEmits(["update:modelValue"]);
 const modelValue = useVModel(props, 'modelValue', emit)
 

package/src/components/ObjsEditor.vue

@@ -1,6 +1,6 @@
 <template>
     <van-field :label="props.label" v-if="!isGone" :disabled="isDisabled" :required="isRequired"
-        :placeholder="props.placeholder">
+        :placeholder="props.placeholder" :rules="rules">
         <template #input>
             <div class="widget-box">
                 <div class="option" v-for="(item, index) in modelValue" :key="index">
@@ -130,7 +130,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 
 const data = reactive({
     inputValue: {},

package/src/components/Sheet.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-field :label="props.label" v-if="!isGone" :disabled="isDisabled" :required="isRequired"
+    <van-field :label="props.label" v-if="!isGone" :disabled="isDisabled" :required="isRequired" :rules="rules"
         :placeholder="props.placeholder">
 
         <template #input>
@@ -51,7 +51,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 
 onMounted(() => {
 })

package/src/components/SingleApiPicker.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="widget">
-    <van-field v-if="!isGone" v-model="formatLabel" :is-link="!isReadonly && !isDisabled" :label="props.label" :placeholder="props.placeholder" readonly
+    <van-field v-if="!isGone" v-model="formatLabel" 
+      :is-link="!isReadonly && !isDisabled" 
+      :label="props.label" 
+      :placeholder="props.placeholder" 
+      :rules="rules"
+      readonly
       :required="isRequired" :disabled="isDisabled" @click="onShow" />
     <van-popup v-model:show="data.isShow" destroy-on-close round position="bottom">
       <van-picker :columns="props.options" @cancel="onCancel" @confirm="onConfirm" />
@@ -42,7 +47,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue', 'select'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 const data = reactive({
   isShow: false
 })

package/src/components/SinglePicker.vue

@@ -1,7 +1,7 @@
 <template>
     <van-field v-if="!isGone" v-model="modelValue" :is-link="!isDisabled" :disabled="isDisabled" readonly name="picker"
         :label="label" label-class="label" :placeholder="props.placeholder" @click-input="onClick" :required="isRequired"
-        :rules="props.rules" />
+        :rules="rules" />
     <van-popup v-model:show="isShowPicker" position="bottom">
         <van-picker :columns="totalOptions" @confirm="onConfirm" @cancel="isShowPicker = false" />
     </van-popup>

package/src/components/SingleUserSelector.vue

@@ -1,7 +1,7 @@
 <template>
   <van-field v-if="!isGone" :is-link="isReadonly ? false : true" readonly :label="props.label"
     :placeholder="props.placeholder" @click="show = !isReadonly" :model-value="selectedUserInfo" :required="isRequired"
-    :rules="props.rules" input-align="center" />
+    :rules="rules" input-align="center" />
   <van-popup v-model:show="show" round position="bottom" class="user-popup">
     <div class="department-selector">
       <div class="picker-header">
@@ -100,7 +100,7 @@ const props = defineProps({
 // 定义emit
 const emit = defineEmits(["update:modelValue", "select"]);
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 
 // 部门列表
 let departments = ref([]);

package/src/components/Switch.vue

@@ -40,7 +40,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 
 onMounted(() => {
 })

package/src/components/TreePicker.vue

@@ -1,6 +1,6 @@
 <template>
   <van-field v-if="!isGone"
-    :label="props.label" :required="isRequired" :rules="props.rules" :disabled="isDisabled"
+    :label="props.label" :required="isRequired" :rules="rules" :disabled="isDisabled"
     :placeholder="props.placeholder" :is-link="isReadonly ? false : true" @click="data.isShowPop = !isReadonly"
     label-class="label">
     <template #input>
@@ -72,7 +72,7 @@ const selectOptions = computed(()=>{
 // 定义emit
 const emit = defineEmits(["update:modelValue","select"]);
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 
 onMounted(async () => {
     await query()

package/src/components/UserPicker.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-field v-if="!isGone" :label="props.label" :required="isRequired" :rules="props.rules" :disabled="isDisabled"
+    <van-field v-if="!isGone" :label="props.label" :required="isRequired" :rules="rules" :disabled="isDisabled"
         :placeholder="props.placeholder" :is-link="isReadonly ? false : true" @click="data.isShowPop = !isReadonly"
         label-class="label">
         <template #input>
@@ -71,7 +71,7 @@ const data = reactive({
 // 定义emit
 const emit = defineEmits(["update:modelValue", "select"]);
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 
 //首页加载
 onMounted(() => {

package/src/components/UsersPicker.vue

@@ -1,6 +1,6 @@
 <template>
   <van-field v-if="!isGone"
-    :label="props.label" :required="isRequired" :rules="props.rules" :disabled="isDisabled"
+    :label="props.label" :required="isRequired" :rules="rules" :disabled="isDisabled"
     :placeholder="props.placeholder" :is-link="isReadonly ? false : true" @click="data.isShowPop = !isReadonly"
     label-class="label">
     <template #input>
@@ -76,7 +76,7 @@ const data = reactive({
 // 定义emit
 const emit = defineEmits(["update:modelValue", "select"]);
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 
 //首页加载
 onMounted(() => {

package/src/components/data_selector.vue

@@ -3,7 +3,7 @@
     <!-- 显示已选数据 -->
     <van-field v-if="!isGone" type="textarea" rows="1" autosize :modelValue="selectdItemsLabel" clearable
       :required="isRequired" :label="label" :name="name" v-bind="$attrs" @click-right-icon="showPopup" @clear="onClear"
-      :right-icon="rightIcon" :rules="props.rules" :class="{ 'disabled-field': isReadonly }" />
+      :right-icon="rightIcon" :rules="rules" :class="{ 'disabled-field': isReadonly }" />
     <!-- 数据选择弹出层 -->
     <van-popup v-model:show="popupVisible" position="bottom" class="popup-style">
       <div>
@@ -93,7 +93,7 @@ const props = defineProps({
   name: String,
 });
 
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 const emit = defineEmits(["update:modelValue", "select"]);
 
 const rightIcon = computed(() => {

package/src/components/image_picker.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-field v-if="!isGone" name="image" :label="props.label" :required="isRequired" :rules="props.rules"
+    <van-field v-if="!isGone" name="image" :label="props.label" :required="isRequired" :rules="rules"
         label-class="label" :placeholder="props.placeholder">
         <template #input>
             <div class="image-box">
@@ -62,7 +62,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 
 const files = ref([])
 

package/src/components/images_picker.vue

@@ -1,5 +1,9 @@
 <template>
-    <van-field name="image" :label="props.label" :required="isRequired" :rules="props.rules" label-class="label"
+    <van-field name="image" 
+        :label="props.label" 
+        :required="isRequired" 
+        :rules="rules" 
+        label-class="label"
         :placeholder="props.placeholder">
         <template #input>
             <div class="image-box">
@@ -74,7 +78,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props)
 const files = ref([])
 const isPreviewMore = ref(false)
 const previews = computed(() => {

package/src/components/subdepartment_selector.vue

@@ -2,7 +2,7 @@
     <div class="department-selector">
         <van-field v-if="!isGone" :model-value="selectedDepartmentPath" readonly clickable :label="props.label"
             :placeholder="props.placeholder" @click="onShow" :right-icon="isReadonly ? '' : 'arrow'"
-            :required="isRequired" :rules="props.rules" type="textarea" autosize="true" rows="1"/>
+            :required="isRequired" :rules="rules" type="textarea" autosize="true" rows="1"/>
 
         <van-popup v-model:show="showPicker" position="bottom" class="department-popup">
             <div class="popup-container">

package/src/components/user_selector.vue

@@ -10,7 +10,7 @@
       @click="showPicker = !props.readonly"
       :right-icon="props.readonly ? '' : 'arrow'"
       :required="props.required"
-      :rules="props.rules"
+      :rules="rules"
     />
 
     <van-popup v-model:show="showPicker" position="bottom" class="user-popup">
@@ -167,7 +167,7 @@ const props = defineProps({
   },
 });
 
-const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props);
+const { isRequired, isReadonly, isGone, isDisabled, rules } = util.props2auth(props);
 
 // 用户加载逻辑
 const userData = ref({

package/src/components/widget/UserPop.vue

@@ -210,7 +210,7 @@ const onSearch = async () => {
     return
 
   // 搜索用户
-  const res = await util.wx_user_list({ keyword: data.keyword, page: 1, limit: 10000 })
+  const res = await util.wx_user_list({ keyword: data.keyword, page: 1, limit: 10 })
   data.searchUsers = res.data.list
 }
 

package/src/util/auth_util.js

@@ -9,7 +9,7 @@ export const TOKEN_PREFIX = import.meta.env.VITE_TOKEN_PREFIX;
 export function getToken() {
     if (import.meta.env.VITE_IS_DEBUG === 'true')
         return TOKEN_PREFIX + import.meta.env.VITE_DEBUG_TOKEN
-    else if(vm.tokenCallback)
+    else if (vm.tokenCallback)
         return vm.tokenCallback()
 }
 
@@ -33,41 +33,49 @@ export const props2auth = (props) => {
         isGone: computed(() => {
             if (props.auth)
                 return props.auth == 'gone'
-        
+
             return false
         }),
-        isDisabled: computed(()=>{
+        isDisabled: computed(() => {
             if (props.auth)
                 return props.auth == 'readonly'
-        
-            if(props.required)
+
+            if (props.required)
                 return false
 
-            if(props.disabled)
+            if (props.disabled)
                 return true
 
-            if(props.readonly)
+            if (props.readonly)
                 return true
-        
+
             return false
         }),
-        isReadonly: computed(()=>{
+        isReadonly: computed(() => {
             if (props.auth)
                 return props.auth == 'readonly'
 
-            if(props.readonly)
+            if (props.readonly)
                 return true
 
-            if(props.required)
+            if (props.required)
                 return false
 
-            if(props.disabled)
+            if (props.disabled)
                 return true
-        
+
             return false
         }),
-        rules: computed(()=>{
-            return props.rules
+        rules: computed(() => {
+            if ((props.rules || []).length > 0)
+                return []
+
+            if(!props.label)
+                return []
+
+            //默认必填校验提示文案
+            if (props.auth == 'require' || props.required)
+                return [{ required: true, message: `${props.label}为空` }]
         })
     }
 }

package/src/views/dataSelector/index.vue

@@ -1,9 +1,17 @@
 <template>
     <div class="page">
-        <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" multiple label="多选数据"
-            placeholder="多选数据" :required="true" :readonly="false" />
+        <van-form @submit="onSubmit">
+            <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" multiple label="多选数据"
+                placeholder="多选数据" :required="true" :readonly="false" />
+
+            <div style="margin: 16px;">
+                <van-button round block type="primary" native-type="submit">
+                    提交
+                </van-button>
+            </div>
+        </van-form>
     </div>
 </template>
 
@@ -15,7 +23,7 @@ const formData = ref({
     singleSelect: '',
     multSelect: [],
     apiSelect: '',
-    auth: 'option'
+    auth: 'require'
 })
 
 // 数据选项
@@ -30,6 +38,10 @@ const options = ref([
     { text: '一号门与二号门之间前花园', value: '一号门与二号门之间前花园' }
 ])
 
+const onSubmit=()=>{
+    console.log('onSubmit')
+}
+
 onMounted(() => {
 })
 </script>