easybill-ui 1.0.9 → 1.0.10

package/components/CurdForm/src/components/schema-form-checkbox.vue

@@ -10,7 +10,7 @@
       </template>
     </el-checkbox-group>
     <div v-if="!formItem.loading && !formItem.options?.length" class="empty">
-      <component :is="formItem.empty" v-if="formItem.empty" :form-model="formModel" :form-item="formItem" :props="props" />
+      <component :is="empty" v-if="empty"  :form-model="formModel" :form-item="formItem" :props="props" />
       <template v-else>
         <el-icon><Warning /></el-icon> <span>{{ props.noDataText || "暂无数据" }}</span>
       </template>
@@ -18,7 +18,7 @@
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, computed, PropType } from "vue"
+import {defineComponent, computed, PropType, toRaw} from "vue"
 import { Loading, Warning } from "@element-plus/icons-vue"
 import { ElCheckbox, ElCheckboxButton, ElCheckboxGroup, ElIcon } from "element-plus"
 import { FormItemProps } from "../types"
@@ -44,6 +44,7 @@ export default defineComponent({
 
     return {
       model,
+      empty:toRaw(props.formItem.empty) || ""
     }
   },
 })

package/components/CurdForm/src/components/schema-form-radio.vue

@@ -18,7 +18,7 @@
       </template>
     </el-radio-group>
     <div v-if="!formItem.loading && !formItem.options?.length" class="empty">
-      <component :is="formItem.empty" v-if="formItem.empty" :form-model="formModel" :form-item="formItem" :props="props" />
+      <component :is="empty" v-if="empty" :form-model="formModel" :form-item="formItem" :props="props" />
       <template v-else>
         <el-icon><Warning /></el-icon> <span>{{ props.noDataText || "暂无数据" }}</span>
       </template>
@@ -47,9 +47,9 @@ export default defineComponent({
       get: () => props.modelValue,
       set: (val) => emit("update:modelValue", val),
     })
-
     return {
       model,
+      empty:toRaw(props.formItem.empty) || ""
     }
   },
 })

package/components/CurdTable/src/hooks/useColumnHook.ts

@@ -73,5 +73,8 @@ export function getFilterFromColumn(a: ColumnItem) {
   if (!item.asyncOptions && a.asyncOptions) {
     item.asyncOptions = a.asyncOptions
   }
+  if (!item.eventObject && a.eventObject) {
+    item.eventObject = a.eventObject
+  }
   return item
 }

package/components/CurdTable/src/types.ts

@@ -1,4 +1,4 @@
-import { FormSchema } from "./../../CurdForm/src/types"
+import {EventObject, FormSchema} from "./../../CurdForm/src/types"
 import { ParamsItem } from "../../TableFilter"
 import { FormItem as FormItemType, Fields, TooltipProps } from "../../CurdForm"
 import { OptionItem } from "../../ConstantStatus"
@@ -29,8 +29,10 @@ export interface ColumnItemCtx<T> extends Partial<TableColumnCtx<T>> {
   children?: ColumnItem<T>[]
   options?: Array<OptionItem> //数据字典
   asyncOptions?: () => Promise<OptionItem[]>
+  eventObject?:EventObject
   form?: Partial<FormItemType> | ((formItem: FormItemType, row: T, query: Fields) => Partial<FormItemType>)
   filter?: ColumnItemFilter
+  empty?: string | any
   detail?: ColumnItemDetail
   value?: any
   copy?: boolean // 对某一列的单元格的值进行复制

package/components/CurdTable/utils/common.ts

@@ -2,12 +2,12 @@ export function deepClone<T extends Array<T> | any>(sourceData: T): T {
   if (Array.isArray(sourceData)) {
     return sourceData.map((item) => deepClone(item)) as T
   }
-  if (typeof sourceData !== "object" || sourceData === null) {
+  if (typeof sourceData !== "object" || sourceData === null || sourceData instanceof Function || sourceData instanceof Date || sourceData instanceof File || sourceData instanceof Symbol) {
     return sourceData
   }
   const obj: T = {} as T
   for (const key in sourceData) {
-    if (typeof sourceData[key] === "object" && sourceData[key] !== null) {
+    if ((typeof sourceData[key] === "object" || sourceData[key] instanceof Date || sourceData[key] instanceof File) && sourceData[key] !== null) {
       obj[key] = deepClone(sourceData[key])
     } else {
       obj[key] = sourceData[key]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a527708ed8f627aec6dde4549c31ed912dabd5f5"
+  "gitHead": "7062a18f17f6dd13ea04ce0542b4e905e43ba6a3"
 }