el-plus-crud 0.0.78 → 0.0.80

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

@@ -45,7 +45,7 @@ import * as validates from './util/validate'
 import { typeList } from './components/index'
 import ElPlusFormBtn from './components/ElPlusFormBtn.vue'
 import { cloneDeep } from 'lodash'
-import { ICRUDConfig, IFormBack, IFormDescItem } from 'types'
+import { ICRUDConfig, IFormBack, IFormDesc, IFormDescItem } from 'types'
 
 // IFormProps定义
 export interface IFormProps {
@@ -227,7 +227,7 @@ const computedRules = computed(() => {
               tempRules[field].push(item)
             })
           }
-        } else if (props.formDesc[field].required || props.formDesc[field].require) {
+        } else if (props.formDesc[field].required) {
           // 如果直接指定 required || require，手动添加校验信息
           //
           let rules = 'notAllBlank'

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

@@ -1,149 +1,152 @@
-<template>
-  <el-input-number v-if="isInit" class="ElPlusFormNumber-panel" v-bind="attrs" v-on="onEvents" v-model="currentValue" :disabled="disabled" @focus="handelFocus" @blur="handelBlur" onkeypress="return( /[\d\.]/.test(String.fromCharCode(event.keyCode)))" />
-</template>
-<script lang="ts">
-export default {
-  name: 'ElPlusFormNumber',
-  inheritAttrs: false,
-  typeName: 'number',
-  customOptions: {}
-}
-</script>
-<script lang="ts" setup>
-import { ref, computed, useAttrs, onBeforeMount, nextTick, inject } from 'vue'
-import { getAttrs, getEvents } from '../mixins'
-import { ElMessage } from 'element-plus'
-import { ICRUDConfig } from 'types'
-
-const defaultConf = inject('defaultConf') as ICRUDConfig
-
-const props = defineProps<{
-  modelValue?: number | null
-  field: string
-  loading?: boolean
-  desc: { [key: string]: any }
-  formData: { [key: string]: any }
-  rowIndex?: number
-  disabled?: boolean
-}>()
-
-const emits = defineEmits(['update:modelValue', 'validateThis'])
-const currentValue = ref(props.modelValue)
-emits('update:modelValue', currentValue)
-const attrs = ref({} as any)
-const isInit = ref(false)
-const onEvents = ref(getEvents(props))
-
-const isDoChange = ref(false)
-
-onBeforeMount(async () => {
-  attrs.value = await getAttrs(props, { ...defaultConf.form?.leng.nbinput, ...useAttrs() })
-  delete attrs.value.min
-  delete attrs.value.max
-  isInit.value = true
-})
-
-/**
- * 获取焦点
- */
-function handelFocus() {
-  isDoChange.value = false
-}
-
-/**
- * 处理失去焦点
- * @param event
- */
-function handelBlur() {
-  if (!isDoChange.value) {
-    if (!currentValue.value) {
-      nextTick(() => {
-        currentValue.value = props.desc?.required ? numBindAttr.value.min : 0
-        if (!props.desc?.required) {
-          // 查看了源码，这里需要二次赋不一样的值，这里才会真正重新渲染
-          nextTick(() => {
-            currentValue.value = null
-          })
-        }
-      })
-    } else {
-      handelValChange(currentValue.value, 0)
-    }
-  }
-  nextTick(() => {
-    emits('validateThis')
-  })
-}
-
-/**
- * 绑定属性
- */
-const numBindAttr = computed(() => {
-  let numAttrs = props.desc.attrs || defaultConf.form?.leng.nbinput
-  if (typeof props.desc.attrs === 'function') {
-    numAttrs = props.desc.attrs(props.formData)
-  }
-  // 这里判断一下，最小和最大值的大小
-  if (numAttrs.min > numAttrs.max) {
-    numAttrs.min = numAttrs.max
-  } else if (numAttrs.max < numAttrs.min) {
-    numAttrs.max = numAttrs.min
-  }
-  return numAttrs
-})
-
-// 判断一下初始值
-if (currentValue.value !== undefined && currentValue.value !== null) {
-  if (currentValue.value < numBindAttr.value.min) {
-    currentValue.value = numBindAttr.value.min
-  } else if (currentValue.value > numBindAttr.value.max) {
-    currentValue.value = numBindAttr.value.max
-  }
-}
-
-const change = onEvents.value.change
-if (change) {
-  onEvents.value.change = (val: any, oldVal: any) => {
-    handelValChange(val, oldVal)
-  }
-} else {
-  onEvents.value.change = handelValChange
-}
-
-/**
- * 监听值改变
- * @param val
- */
-function handelValChange(val: any, oldVal: any) {
-  isDoChange.value = true
-  if (val !== oldVal) {
-    if (val < numBindAttr.value.min) {
-      ElMessage.warning(`${props.desc?.label || ''}最少不能低于${numBindAttr.value.min}`)
-      nextTick(() => {
-        currentValue.value = numBindAttr.value.min
-      })
-    } else if (val > numBindAttr.value.max) {
-      ElMessage.warning(`${props.desc?.label || ''}最多不能大于${numBindAttr.value.max}`)
-      nextTick(() => {
-        currentValue.value = numBindAttr.value.max
-        change && change()
-      })
-    } else {
-      change && change()
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.ElPlusFormNumber-panel {
-  width: 100% !important;
-  max-width: 100%;
-  :deep(.el-input__wrapper) {
-    // padding-left: 11px !important;
-    input {
-      text-align: left !important;
-    }
-  }
-}
-</style>
-types
+<template>
+  <el-input-number v-if="isInit" class="ElPlusFormNumber-panel" v-bind="attrs" v-on="onEvents" v-model="currentValue" :disabled="disabled" @focus="handelFocus" @blur="handelBlur" onkeypress="return( /[\d\.]/.test(String.fromCharCode(event.keyCode)))" />
+</template>
+<script lang="ts">
+export default {
+  name: 'ElPlusFormNumber',
+  inheritAttrs: false,
+  typeName: 'number',
+  customOptions: {}
+}
+</script>
+<script lang="ts" setup>
+import { ref, computed, useAttrs, onBeforeMount, nextTick, inject } from 'vue'
+import { getAttrs, getEvents } from '../mixins'
+import { ElMessage } from 'element-plus'
+import { ICRUDConfig } from 'types'
+
+const defaultConf = inject('defaultConf') as ICRUDConfig
+
+const props = defineProps<{
+  modelValue?: number | null
+  field: string
+  loading?: boolean
+  desc: { [key: string]: any }
+  formData: { [key: string]: any }
+  rowIndex?: number
+  disabled?: boolean
+}>()
+
+const emits = defineEmits(['update:modelValue', 'validateThis'])
+const currentValue = ref(props.modelValue)
+emits('update:modelValue', currentValue)
+const attrs = ref({} as any)
+const isInit = ref(false)
+const onEvents = ref(getEvents(props))
+
+const isDoChange = ref(false)
+
+onBeforeMount(async () => {
+  attrs.value = await getAttrs(props, { ...defaultConf.form?.leng.nbinput, ...useAttrs() })
+  delete attrs.value.min
+  delete attrs.value.max
+  isInit.value = true
+})
+
+/**
+ * 获取焦点
+ */
+function handelFocus() {
+  isDoChange.value = false
+}
+
+/**
+ * 处理失去焦点
+ * @param event
+ */
+function handelBlur() {
+  console.log('currentValue', currentValue.value)
+
+  if (!isDoChange.value) {
+    if (currentValue.value !== 0 && !currentValue.value) {
+      nextTick(() => {
+        currentValue.value = props.desc?.required ? numBindAttr.value.min : 0
+        if (currentValue.value === 0) {
+          // 查看了源码，这里需要二次赋不一样的值，这里才会真正重新渲染
+          nextTick(() => {
+            currentValue.value = null
+            change && change()
+          })
+        }
+      })
+    } else {
+      handelValChange(currentValue.value, 0)
+    }
+  }
+  nextTick(() => {
+    emits('validateThis')
+  })
+}
+
+/**
+ * 绑定属性
+ */
+const numBindAttr = computed(() => {
+  let numAttrs = props.desc.attrs || defaultConf.form?.leng.nbinput
+  if (typeof props.desc.attrs === 'function') {
+    numAttrs = props.desc.attrs(props.formData)
+  }
+  // 这里判断一下，最小和最大值的大小
+  if (numAttrs.min > numAttrs.max) {
+    numAttrs.min = numAttrs.max
+  } else if (numAttrs.max < numAttrs.min) {
+    numAttrs.max = numAttrs.min
+  }
+  return numAttrs
+})
+
+// 判断一下初始值
+if (currentValue.value !== undefined && currentValue.value !== null) {
+  if (currentValue.value < numBindAttr.value.min) {
+    currentValue.value = numBindAttr.value.min
+  } else if (currentValue.value > numBindAttr.value.max) {
+    currentValue.value = numBindAttr.value.max
+  }
+}
+
+const change = onEvents.value.change
+if (change) {
+  onEvents.value.change = (val: any, oldVal: any) => {
+    handelValChange(val, oldVal)
+  }
+} else {
+  onEvents.value.change = handelValChange
+}
+
+/**
+ * 监听值改变
+ * @param val
+ */
+function handelValChange(val: any, oldVal: any) {
+  isDoChange.value = true
+  if (val !== oldVal) {
+    if (val < numBindAttr.value.min) {
+      ElMessage.warning(`${props.desc?.label || ''}最少不能低于${numBindAttr.value.min}`)
+      nextTick(() => {
+        currentValue.value = numBindAttr.value.min
+        change && change()
+      })
+    } else if (val > numBindAttr.value.max) {
+      ElMessage.warning(`${props.desc?.label || ''}最多不能大于${numBindAttr.value.max}`)
+      nextTick(() => {
+        currentValue.value = numBindAttr.value.max
+        change && change()
+      })
+    } else {
+      change && change()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.ElPlusFormNumber-panel {
+  width: 100% !important;
+  max-width: 100%;
+  :deep(.el-input__wrapper) {
+    // padding-left: 11px !important;
+    input {
+      text-align: left !important;
+    }
+  }
+}
+</style>