el-plus-crud 0.0.64 → 0.0.65

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

@@ -243,9 +243,11 @@ const computedRules = computed(() => {
             case 'linkuser':
             case 'radio':
             case 'checkbox':
-            case 'daterange':
               rules = 'select'
               break
+            case 'daterange':
+              rules = 'cascader'
+              break
           }
           tempRules[field].push(...(validates as any)[rules])
         }

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

@@ -1,41 +1,53 @@
-<template>
-  <el-time-picker v-if="isInit" class="ElPlusFormTime-panel" v-bind="attrs" v-on="onEvents" v-model="currentValue" :disabled="disabled" />
-</template>
-<script lang="ts">
-export default {
-  name: 'ElPlusFormTime',
-  inheritAttrs: false,
-  typeName: 'time',
-  customOptions: {}
-}
-</script>
-<script lang="ts" setup>
-import { ref, useAttrs, onBeforeMount } from 'vue'
-import { getAttrs, getEvents } from '../mixins'
-
-const props = defineProps<{
-  modelValue?: Array<string> | Date | null
-  field: string
-  desc: { [key: string]: any }
-  formData: { [key: string]: any }
-  disabled?: boolean
-}>()
-
-const emits = defineEmits(['update:modelValue'])
-const currentValue = ref(props.modelValue)
-const attrs = ref({} as any)
-const isInit = ref(false)
-const onEvents = ref(getEvents(props))
-
-emits('update:modelValue', currentValue)
-
-onBeforeMount(async () => {
-  attrs.value = await getAttrs(props, { ...useAttrs() })
-  isInit.value = true
-})
-</script>
-<style lang="scss" scoped>
-.ElPlusFormTime-panel {
-  display: flex;
-}
-</style>
+<template>
+  <el-time-picker v-if="isInit" class="ElPlusFormTime-panel" v-bind="attrs" v-on="onEvents" v-model="currentValue" :disabled="disabled" />
+</template>
+<script lang="ts">
+export default {
+  name: 'ElPlusFormTime',
+  inheritAttrs: false,
+  typeName: 'time',
+  customOptions: {}
+}
+</script>
+<script lang="ts" setup>
+import { ref, useAttrs, watch, onBeforeMount } from 'vue'
+import { getAttrs, getEvents } from '../mixins'
+
+const props = defineProps<{
+  modelValue?: Array<string> | string | Date | null
+  field: string
+  desc: { [key: string]: any }
+  formData: { [key: string]: any }
+  disabled?: boolean
+}>()
+
+const emits = defineEmits(['update:modelValue'])
+const currentValue = ref()
+const attrs = ref({} as any)
+const isInit = ref(false)
+const onEvents = ref(getEvents(props))
+
+emits('update:modelValue', currentValue)
+
+onBeforeMount(async () => {
+  attrs.value = await getAttrs(props, { editable: false, ...useAttrs() })
+  isInit.value = true
+})
+
+watch(
+  () => props.modelValue,
+  (val: Array<string> | string | Date | null | undefined) => {
+    if (val) {
+      currentValue.value = Array.isArray(val) ? val.map((item) => new Date(item)) : new Date(val)
+    } else {
+      currentValue.value = attrs.value.isRange ? [] : null
+    }
+  },
+  { immediate: true }
+)
+</script>
+<style lang="scss" scoped>
+.ElPlusFormTime-panel {
+  display: flex;
+}
+</style>

package/lib/components/el-plus-form/util/validate.ts

@@ -84,7 +84,7 @@ export const select = [{ required: true, trigger: 'change', validator: validateS
  * 级联选择
  * @type {[*]}
  */
-export const cascader = [{ required: true, trigger: 'change', validator: validateSelect }]
+export const cascader = [{ required: true, trigger: 'change', validator: validateCascader }]
 
 /**
  * 必须上传
@@ -171,6 +171,20 @@ function validateInputNotAllBlank(rule: any, value: any, callback?: any) {
  * @param callback
  */
 function validateSelect(rule: any, value: any, callback?: any) {
+  if (value === null || typeof value === 'undefined' || value === '') {
+    callback(new Error('请选择！'))
+  } else {
+    callback()
+  }
+}
+
+/**
+ * 数组选择
+ * @param rule
+ * @param value
+ * @param callback
+ */
+function validateCascader(rule: any, value: any, callback?: any) {
   if (value === null || typeof value === 'undefined' || value === '' || value.length <= 0 || value[0] == null) {
     callback(new Error('请选择！'))
   } else {

package/package.json

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