easybill-ui 0.1.13 → 0.1.15

package/components/CurdForm/src/CurdForm.vue

@@ -85,14 +85,14 @@ export default defineComponent({
     // 先从schema中读取默认值
     const schemaValues = sFormSchema.value.formItem.reduce<Fields>((previousValue, currentValue) => {
       currentValue.eventObject ??= {}
-      typeof currentValue.value == "undefined" ? false : currentValue.prop && (previousValue[currentValue.prop] = currentValue.value)
+      typeof currentValue.value == "undefined" ? false : currentValue.prop && (typeof formModel[currentValue.prop] == "undefined" || formModel[currentValue.prop] === "" || formModel[currentValue.prop] === null) && (previousValue[currentValue.prop] = currentValue.value)
       return previousValue
     }, {})
 
     Object.assign(formModel, schemaValues)
     // 如果有默认值，则覆盖
     props.fields && Object.assign(formModel, props.fields)
-    Object.assign(formModel, props.modelValue)
+    // Object.assign(formModel, props.modelValue)
     // props.modelValue && Object.assign(formModel, props.modelValue)
     // 异步设置默认数据
     sFormSchema.value.formItem.forEach(async (item) => {

package/components/CurdForm/src/FormItem.vue

@@ -56,14 +56,22 @@ const eventObject = ref(
       }
     }
     const changeFun = props.formItem.eventObject.change
-    result.change = () => {
+    result.change = (...args: any) => {
       if (changeFun) {
-        const flag = changeFun && changeFun(props.formModel, props.formItem, formContext)
+        const flag = changeFun && changeFun(props.formModel, props.formItem, formContext, ...args)
         if (flag) {
-          emit("change", props.formModel, props.formItem, formContext)
+          emit("change", props.formModel, props.formItem, formContext, ...args)
         }
       } else {
-        emit("change", props.formModel, props.formItem, formContext)
+        emit("change", props.formModel, props.formItem, formContext, ...args)
+      }
+    }
+    for (let i in result) {
+      if (i !== "change") {
+        const fun = result[i]
+        result[i] = (...args: any) => {
+          fun(props.formModel, props.formItem, formContext, ...args)
+        }
       }
     }
     return result

package/components/DetailInfo/src/types.ts

@@ -1,7 +1,7 @@
 import { ElTooltipProps } from "element-plus"
 import { OptionItem } from "../../ConstantStatus/src/types"
 
-export interface DetailDataItem {
+export interface DetailDataItem extends Record<string, any> {
   label?: string
   value?: string | number | boolean
   /** 当前项占的宽度，最大24, 默认24 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "226a17bb08a84762991632ed3f084f2ae2638501"
+  "gitHead": "3a4e0176fa8a2b7ad06158ac2f7bffab71e0268d"
 }