el-plus-crud 0.1.47 → 0.1.49

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

@@ -160,6 +160,13 @@ async function clearValid() {
   return await Promise.all(formRefs.value.map((tempRef) => tempRef.clearValid()))
 }
 
+/**
+ * 清空表单
+ */
+async function clear() {
+  return await Promise.all(formRefs.value.map((tempRef) => tempRef.clear()))
+}
+
 /**
  * 获取数据
  */
@@ -171,7 +178,7 @@ function getData() {
   return tempData
 }
 
-defineExpose({ validate, getData, clearValid })
+defineExpose({ validate, getData, clearValid, clear })
 </script>
 <style lang="scss">
 .el-plus-form-group {

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

@@ -228,7 +228,7 @@ function refreshValue() {
   divList.map((item: any, i: number) => {
     str = str.replace(item, '${' + yzList[i] + '}')
   })
-  currentValue.value = str.replaceAll(' ', '')
+  currentValue.value = str.replaceAll('&nbsp;', '').replaceAll('&lt;', '<').replaceAll('&gt;', '>')
 }
 
 /**
@@ -306,6 +306,7 @@ onUnmounted(() => {
     margin-bottom: 20px;
     color: var(--el-color-danger);
     min-height: 25px;
+    word-break: break-all;
   }
   .title-tip {
     margin-bottom: 20px;

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

@@ -1,5 +1,5 @@
 <template>
-  <el-input style="display: flex" v-bind="attrs" v-on="onEvents" v-model="currentText" @focus="handelFocus" @blur="handelBlur" onkeypress="return event.target.value === '' || event.target.value === undefined || event.target.value?.indexOf('.') >= 0 ? /[-\d]/.test(String.fromCharCode(event.keyCode)): /[-\d\.]/.test(String.fromCharCode(event.keyCode))">
+  <el-input style="display: flex" v-bind="attrs" :disabled="disabled" v-on="onEvents" v-model="currentText" @focus="handelFocus" @blur="handelBlur" onkeypress="return event.target.value === '' || event.target.value === undefined || event.target.value?.indexOf('.') >= 0 ? /[-\d]/.test(String.fromCharCode(event.keyCode)): /[-\d\.]/.test(String.fromCharCode(event.keyCode))">
     <template v-for="(item, key, index) of slots" #[key] :key="index">
       <slot :name="key" />
     </template>
@@ -15,7 +15,7 @@ export default {
 }
 </script>
 <script lang="ts" setup>
-import { ref, watch, useAttrs, useSlots, onBeforeMount, nextTick, computed } from 'vue'
+import { ref, useAttrs, useSlots, onBeforeMount, nextTick, computed, watch } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
 import { ElMessage } from 'element-plus'
 
@@ -23,6 +23,7 @@ const props = defineProps<{
   modelValue?: number | null
   field: string
   desc: { [key: string]: any }
+  disabled?: boolean
   formData: { [key: string]: any }
 }>()
 const emits = defineEmits(['update:modelValue', 'validateThis'])
@@ -81,14 +82,17 @@ function handelBlur() {
 const numBindAttr = computed(() => {
   let min = 0
   let max = 100
+  let precision = 5
+
   let tempAttrs = props.desc?.attrs || props.desc
   if (props.desc?.attrs && typeof props.desc.attrs === 'function') {
     tempAttrs = props.desc.attrs(props.formData || {})
   }
 
-  const { min: min_, max: max_ } = (tempAttrs || {}) as any
+  const { min: min_, max: max_, precision: precision_ } = (tempAttrs || {}) as any
   if (min_ !== undefined && min_ !== null && min_ !== '') min = min_
   if (max_ !== undefined && max_ !== null && max_ !== '') max = max_
+  if (precision_ !== undefined && precision_ !== null && precision_ !== '' && precision_ >= 2) precision = precision_
 
   // 这里判断一下，最小和最大值的大小
   if (min > max) {
@@ -96,7 +100,7 @@ const numBindAttr = computed(() => {
   } else if (max < min) {
     max = min
   }
-  return { min, max }
+  return { min, max, precision }
 })
 
 // 判断一下初始值
@@ -128,20 +132,45 @@ function handelValChange(val: any, oldVal: any) {
       ElMessage.warning(`${props.desc?.label || ''}最少不能低于${numBindAttr.value.min}`)
       nextTick(() => {
         currentText.value = numBindAttr.value.min
-        currentValue.value = +(currentText.value / 100).toFixed(4)
+        currentValue.value = +(currentText.value / 100).toFixed(numBindAttr.value.precision)
         change && change()
       })
     } else if (val > numBindAttr.value.max) {
       ElMessage.warning(`${props.desc?.label || ''}最多不能大于${numBindAttr.value.max}`)
       nextTick(() => {
         currentText.value = numBindAttr.value.max
-        currentValue.value = +(currentText.value / 100).toFixed(4)
+        currentValue.value = +(currentText.value / 100).toFixed(numBindAttr.value.precision)
         change && change()
       })
     } else {
-      currentValue.value = +(val / 100).toFixed(4)
+      if (val.indexOf('.') > 0 && val.length - val.indexOf('.') > numBindAttr.value.precision - 2) {
+        currentText.value = (+val).toFixed(numBindAttr.value.precision - 2)
+      } else {
+        currentText.value = val
+      }
+      currentValue.value = +(val / 100).toFixed(numBindAttr.value.precision)
       change && change()
     }
   }
 }
+
+/**
+ * 清空数据
+ */
+function clear() {
+  currentText.value = null
+  currentValue.value = null
+  isDoChange.value = false
+}
+
+watch(
+  () => props.modelValue,
+  (val: any) => {
+    if (val !== undefined && val !== null && val !== '') {
+      handelValChange((val * 100).toFixed(numBindAttr.value.precision - 2), null)
+    }
+  }
+)
+
+defineExpose({ clear, field: props.field })
 </script>

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

@@ -214,7 +214,7 @@ async function getToken(token: string | Object | Function | undefined, param?: a
 async function handelUploadSuccess(response: any, file: any) {
   if (response && Object.keys(response).length > 0) {
     // 从结果集中获取一下furl
-    const tempUrl = getValue(defaultConf.upload?.actionMap?.objectUrlKey || [], response.request)
+    const tempUrl = getValue(defaultConf.upload?.actionMap?.objectUrlKey || [], response.request || response)
     if (tempUrl) file.raw.furl = tempUrl
   }
   // 获取文件上传的token以及上传路径

package/package.json

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