widget.qw 1.0.47 → 1.0.48

package/build/widget.qw.es.js

@@ -17071,10 +17071,15 @@ const _sfc_main$o = {
       isDisabled
     } = util.props2auth(props);
     const modelValue = useVModel(props, "modelValue", emit);
-    const formatTime = (time) => {
-      let res = time;
-      return res;
-    };
+    const formatTime = computed({
+      get() {
+        let res = props.modelValue;
+        return res;
+      },
+      set() {
+        modelValue.value = "";
+      }
+    });
     watch(() => props.modelValue, (n, o) => {
       if (!props.defaultnow)
         return;
@@ -17086,6 +17091,7 @@ const _sfc_main$o = {
       immediate: true
     });
     function onToggleShow() {
+      console.log("11111111");
       if (isReadonly.value)
         return;
       data2.isShow = true;
@@ -17094,20 +17100,19 @@ const _sfc_main$o = {
       const _component_van_field = resolveComponent("van-field");
       return openBlock(), createElementBlock(Fragment, null, [!unref(isGone) ? (openBlock(), createBlock(_component_van_field, {
         key: 0,
-        modelValue: props.modelValue,
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => props.modelValue = $event),
+        modelValue: unref(formatTime),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(formatTime) ? formatTime.value = $event : null),
         name: "datetimePicker",
         label: props.label,
+        disabled: unref(isDisabled),
+        readonly: unref(isReadonly),
+        clearable: "",
         placeholder: props.placeholder,
-        readonly: "",
         required: unref(isRequired),
         rules: props.rules,
         "is-link": unref(isReadonly) ? false : true,
         onClick: onToggleShow
-      }, {
-        input: withCtx(() => [createTextVNode(toDisplayString(formatTime(props.modelValue)), 1)]),
-        _: 1
-      }, 8, ["modelValue", "label", "placeholder", "required", "rules", "is-link"])) : createCommentVNode("", true), createVNode(_sfc_main$p, {
+      }, null, 8, ["modelValue", "label", "disabled", "readonly", "placeholder", "required", "rules", "is-link"])) : createCommentVNode("", true), createVNode(_sfc_main$p, {
         isShow: data2.isShow,
         "onUpdate:isShow": _cache[1] || (_cache[1] = ($event) => data2.isShow = $event),
         modelValue: unref(modelValue),

package/build/widget.qw.umd.js

@@ -17074,10 +17074,15 @@ var __async = (__this, __arguments, generator) => {
         isDisabled
       } = util.props2auth(props);
       const modelValue = useVModel(props, "modelValue", emit);
-      const formatTime = (time) => {
-        let res = time;
-        return res;
-      };
+      const formatTime = vue.computed({
+        get() {
+          let res = props.modelValue;
+          return res;
+        },
+        set() {
+          modelValue.value = "";
+        }
+      });
       vue.watch(() => props.modelValue, (n, o) => {
         if (!props.defaultnow)
           return;
@@ -17089,6 +17094,7 @@ var __async = (__this, __arguments, generator) => {
         immediate: true
       });
       function onToggleShow() {
+        console.log("11111111");
         if (isReadonly.value)
           return;
         data2.isShow = true;
@@ -17097,20 +17103,19 @@ var __async = (__this, __arguments, generator) => {
         const _component_van_field = vue.resolveComponent("van-field");
         return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [!vue.unref(isGone) ? (vue.openBlock(), vue.createBlock(_component_van_field, {
           key: 0,
-          modelValue: props.modelValue,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => props.modelValue = $event),
+          modelValue: vue.unref(formatTime),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(formatTime) ? formatTime.value = $event : null),
           name: "datetimePicker",
           label: props.label,
+          disabled: vue.unref(isDisabled),
+          readonly: vue.unref(isReadonly),
+          clearable: "",
           placeholder: props.placeholder,
-          readonly: "",
           required: vue.unref(isRequired),
           rules: props.rules,
           "is-link": vue.unref(isReadonly) ? false : true,
           onClick: onToggleShow
-        }, {
-          input: vue.withCtx(() => [vue.createTextVNode(vue.toDisplayString(formatTime(props.modelValue)), 1)]),
-          _: 1
-        }, 8, ["modelValue", "label", "placeholder", "required", "rules", "is-link"])) : vue.createCommentVNode("", true), vue.createVNode(_sfc_main$p, {
+        }, null, 8, ["modelValue", "label", "disabled", "readonly", "placeholder", "required", "rules", "is-link"])) : vue.createCommentVNode("", true), vue.createVNode(_sfc_main$p, {
           isShow: data2.isShow,
           "onUpdate:isShow": _cache[1] || (_cache[1] = ($event) => data2.isShow = $event),
           modelValue: vue.unref(modelValue),

package/package.json

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

package/src/components/DatetimePicker/index.vue

@@ -1,36 +1,31 @@
 <template>
-    <van-field v-if="!isGone" 
-        v-model="props.modelValue" name="datetimePicker" :label="props.label"
-        :placeholder="props.placeholder" readonly :required="isRequired" :rules="props.rules"
-        :is-link="isReadonly ? false : true"
-        @click="onToggleShow">
-        <template #input>
-            {{ formatTime(props.modelValue) }}
-        </template>
+    <van-field v-if="!isGone" v-model="formatTime" name="datetimePicker" :label="props.label" 
+        :disabled="isDisabled"
+        :readonly="isReadonly"
+        clearable
+        :placeholder="props.placeholder" :required="isRequired" :rules="props.rules"
+        :is-link="isReadonly ? false : true" @click="onToggleShow">
     </van-field>
 
     <!-- 弹出层 -->
-    <DatetimePop v-model:isShow="data.isShow" 
-        v-model="modelValue"
-        :before="props.before" 
-        :defaultnow="props.defaultnow"
+    <DatetimePop v-model:isShow="data.isShow" v-model="modelValue" :before="props.before" :defaultnow="props.defaultnow"
         :columnsType="props.columnsType" />
 </template>
 
 
 <script setup>
-import { ref,reactive, watch, getCurrentInstance, computed } from "vue"
+import { ref, reactive, watch, getCurrentInstance, computed } from "vue"
 import DatetimePop from './DatetimePop.vue'
 import util from '../../util'
 import { useVModel } from "@vueuse/core"
 
 const props = defineProps({
-    modelValue:{
+    modelValue: {
         type: String,
         default: ''
     },
     label: {
-        type:String,
+        type: String,
         default: ''
     },
     readonly: {
@@ -41,7 +36,7 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
-    before:{
+    before: {
         type: Boolean,
         default: false
     },
@@ -53,35 +48,40 @@ const props = defineProps({
         type: Array,
         default: ['year', 'month', 'day', 'hour', 'minute', 'second']
     },
-    placeholder:{
-        type:String,
-        default:''
+    placeholder: {
+        type: String,
+        default: ''
     },
-    auth:{
-        type:String,
-        default:''
+    auth: {
+        type: String,
+        default: ''
     },
-    rules:{
+    rules: {
         type: Array,
-        default:null
+        default: null
     }
 })
 const data = reactive({
     isShow: false, //是否显示弹出层
 })
-const {isRequired, isReadonly, isGone,isDisabled} = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
 //定义要向父组件传递的事件
 const emit = defineEmits(["update:modelValue"])
 const modelValue = useVModel(props, "modelValue", emit)
 
-const formatTime=(time)=>{
-    let res = time
+const formatTime = computed({
+    get() {
+        let res = props.modelValue
 
-    // let week_day = util.date2week_day(time)
-    // res = time+'/'+week_day
+        // let week_day = util.date2week_day(time)
+        // res = time+'/'+week_day
 
-    return res
-}
+        return res
+    }, 
+    set() {
+        modelValue.value = ''
+    }
+})
 
 // 默认当前时间
 watch(
@@ -95,7 +95,7 @@ watch(
         if (n) {
             return
         }
-        
+
         // 没有值时，默认设置为当前时间
         modelValue.value = util.date2yyyyMMddhhmmss(new Date())
     },
@@ -105,6 +105,8 @@ watch(
 )
 
 function onToggleShow() {
+    console.log('11111111')
+
     if (isReadonly.value)
         return