el-plus-crud 0.1.21 → 0.1.23

package/lib/components/el-plus-form/components/ElPlusFormCascader.vue

@@ -13,6 +13,7 @@ export default {
 import { ref, useAttrs, onBeforeMount, inject, reactive, watch } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
 import { isEqual } from '../../../util'
+import { useVModel } from '@vueuse/core'
 
 const globalData = inject('globalData') as any
 
@@ -25,8 +26,7 @@ const props = defineProps<{
 }>()
 
 const emits = defineEmits(['update:modelValue'])
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const isInit = ref(false)
 const attrs = ref({} as any)
@@ -62,4 +62,3 @@ watch(
   display: flex;
 }
 </style>
-../util/aaaaa

package/lib/components/el-plus-form/components/ElPlusFormCheckbox.vue

@@ -17,6 +17,7 @@ export default {
 import { ref, reactive, watch, useAttrs, onBeforeMount, inject } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
 import { isEqual } from '../../../util'
+import { useVModel } from '@vueuse/core'
 
 const globalData = inject('globalData') as any
 
@@ -29,8 +30,7 @@ const props = defineProps<{
 }>()
 
 const emits = defineEmits(['update:modelValue'])
-const currentValue = ref([] as any)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const options = reactive([] as any[])
 const isInit = ref(false)

package/lib/components/el-plus-form/components/ElPlusFormDate.vue

@@ -12,6 +12,7 @@ export default {
 <script lang="ts" setup>
 import { ref, useAttrs, onBeforeMount } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
+import { useVModel } from '@vueuse/core'
 
 const props = defineProps<{
   modelValue?: string | number | '' | null
@@ -25,8 +26,7 @@ const emits = defineEmits(['update:modelValue'])
 const isInit = ref(false)
 const attrs = ref({} as any)
 const onEvents = ref(getEvents(props))
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 onBeforeMount(async () => {
   attrs.value = await getAttrs(props, { valueFormat: 'YYYY-MM-DD HH:mm:ss', editable: false, ...useAttrs() })

package/lib/components/el-plus-form/components/ElPlusFormPassword.vue

@@ -18,6 +18,7 @@ export default {
 import { ref, useAttrs, useSlots, onBeforeMount, inject } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
 import { ICRUDConfig } from '../../../../types'
+import { useVModel } from '@vueuse/core'
 
 const defaultConf = inject('defaultConf') as ICRUDConfig
 
@@ -30,8 +31,7 @@ const props = defineProps<{
   disabled?: boolean
 }>()
 const emits = defineEmits(['update:modelValue'])
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const slots = ref(Object.assign({}, useSlots(), props.desc.slots))
 const attrs = ref({} as any)

package/lib/components/el-plus-form/components/ElPlusFormRadio.vue

@@ -17,6 +17,7 @@ export default {
 import { ref, reactive, useAttrs, watch, onBeforeMount, inject } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
 import { isEqual } from '../../../util'
+import { useVModel } from '@vueuse/core'
 
 const globalData = inject('globalData') as any
 
@@ -29,8 +30,7 @@ const props = defineProps<{
 }>()
 
 const emits = defineEmits(['update:modelValue'])
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const options = reactive([] as any[])
 const isInit = ref(false)

package/lib/components/el-plus-form/components/ElPlusFormRate.vue

@@ -12,6 +12,7 @@ export default {
 <script lang="ts" setup>
 import { ref, watch, useAttrs, onBeforeMount } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
+import { useVModel } from '@vueuse/core'
 
 const emits = defineEmits(['update:modelValue', 'validateThis'])
 const props = defineProps<{
@@ -22,8 +23,7 @@ const props = defineProps<{
   disabled?: boolean
 }>()
 
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const attrs = ref({} as any)
 const onEvents = ref(getEvents(props))

package/lib/components/el-plus-form/components/ElPlusFormSelect.vue

@@ -24,6 +24,7 @@ import { ElMessage } from 'element-plus'
 import { getAttrs } from '../mixins'
 import { isEqual, isPromiseLike } from '../../../util'
 import { ICRUDConfig } from '../../../../types'
+import { useVModel } from '@vueuse/core'
 
 const defaultConf = inject('defaultConf') as ICRUDConfig
 const globalData = inject('globalData') as any
@@ -42,9 +43,7 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits(['update:modelValue'])
-
-const currentValue = ref(props.modelValue || (props.desc.multiple ? [] : ''))
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const attrs = ref({} as any)
 const options = reactive([] as any[])
@@ -124,6 +123,7 @@ onBeforeMount(async () => {
   tempAttr.remote = !!props.desc.remote
   attrs.value = await getAttrs(props, tempAttr)
   attrs.value.remote = !!props.desc.remote
+  delete attrs.value.disabled
   isInit.value = true
 })
 

package/lib/components/el-plus-form/components/ElPlusFormSwitch.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="el-plus-form-switch">
+    {{ props.modelValue + '-' + currentValue }}
     <el-switch v-if="isInit" v-bind="attrs" :disabled="disabled" v-on="onEvents" :loading="props.loading || localLoading" v-model="currentValue" :before-change="handelBeforeChange" />
   </div>
 </template>
@@ -15,6 +16,7 @@ export default {
 import { ref, useAttrs, onBeforeMount } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
 import { ElMessageBox } from 'element-plus'
+import { useVModel } from '@vueuse/core'
 
 const emits = defineEmits(['update:modelValue'])
 const props = defineProps<{
@@ -27,9 +29,7 @@ const props = defineProps<{
 }>()
 
 const localLoading = ref(false)
-
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const isInit = ref(false)
 const attrs = ref({} as any)

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",