easybill-ui 0.1.11 → 0.1.12

package/components/CurdForm/src/CurdForm.vue

@@ -121,6 +121,9 @@ export default defineComponent({
     })
     // 生成表单验证规则
     const rules = computed(() => {
+      if (typeof sFormSchema.value.rules == "function") {
+        return sFormSchema.value.rules(formModel, curdFormContext)
+      }
       return sFormSchema.value.rules
     })
 
@@ -129,16 +132,16 @@ export default defineComponent({
       return schemaFormRef.value?.validate(callback)
     }
     // 调用某个表单项的异步数据接口
-    const loadOptions = async (prop: string) => {
+    const loadOptions = async (prop: string, option?: any) => {
       const cur = sFormSchema.value.formItem.find((a) => a.prop == prop)
       if (cur && cur.asyncOptions) {
         cur.loading = true
         cur.options =
           (await cur
-            .asyncOptions(formModel, cur, curdFormContext)
+            .asyncOptions(formModel, cur, curdFormContext, option)
             .catch((err) => console.error("loadOptionError", err))
             .finally(() => (cur.loading = false))) || []
-        cur.eventObject?.optionLoaded && cur.eventObject?.optionLoaded(formModel, cur, curdFormContext)
+        cur.eventObject?.optionLoaded && cur.eventObject?.optionLoaded(formModel, cur, curdFormContext, option)
       }
       return cur
     }

package/components/CurdForm/src/types.ts

@@ -4,7 +4,7 @@ import { OptionItem } from "../../ConstantStatus"
 import { defineComponent } from "vue"
 export interface FormSchema extends Partial<FormProps> {
   formItem: Array<FormItem>
-  rules?: FormRules
+  rules?: FormRules | ((formModel: Fields, context: FormContext) => FormRules)
   labelPosition?: "left" | "right" | "top"
   gutter?: number
 }
@@ -19,7 +19,7 @@ export interface FormItem {
   asyncValue?: (modelRef: Fields, formItem: FormItem) => Promise<string | number | boolean>
   loading?: boolean
   hidden?: boolean | ((model: Fields) => boolean)
-  rules?: FormItemRule[]
+  rules?: FormItemRule[] | ((formModel: Fields, formItem: FormItem, context: FormContext) => FormItemRule[])
   props?: FormItemPropObject | ((formModel: Fields, formItem: FormItem) => void)
   formItemProps?: FormItemPropObject | ((formModel: Fields, formItem: FormItem) => void)
   labelWidth?: string
@@ -27,8 +27,8 @@ export interface FormItem {
   disabled?: boolean
   tooltip?: string | ((formModel: Fields, formItem: FormItem) => Partial<ElTooltipProps>) | Partial<ElTooltipProps>
   autoload?: boolean
-  prefix?: string | any[]
-  suffix?: string | any[]
+  prefix?: string | any
+  suffix?: string | any
 }
 export type FormItemTypeEmun = "input" | "select" | "radio" | "checkbox" | "input-number" | "switch" | "file" | "date-picker" | "time-picker" | "color-picker" | "value"
 // type FormItemProps = FormItemPropObject | ((formModel: Fields, formItem: FormItem) => void)

package/components/DetailInfo/src/DetailInfo.vue

@@ -15,7 +15,7 @@
       <slot></slot>
     </div>
     <div v-if="!$slots.default" class="detail-info-body" :class="[props.showType]">
-      <div class="table-detail-col" v-for="(item, i) in props.data" :key="i" :span="item.span" :style="getItemStyle(item)">
+      <div class="table-detail-col" v-for="(item, i) in list" :key="i" :span="item.span" :style="getItemStyle(item)">
         <div class="item-col">
           <div v-if="item.label" class="label" :style="{ width: getLabelWidth(item), justifyContent: props.labelPosition || item.labelPosition }">
             <span>{{ item.label }}</span>
@@ -44,7 +44,7 @@ export default {
 }
 </script>
 <script lang="ts" setup>
-import { PropType } from "vue"
+import { PropType, computed } from "vue"
 import { ConstantStatus } from "../../ConstantStatus/src"
 import { DetailDataItem } from "./types"
 import DetailInfoTooltip from "./DetailInfoTooltip.vue"
@@ -73,6 +73,13 @@ const props = defineProps({
     default: "left",
   },
 })
+const list = computed(() => {
+  return props.data.filter((item) => {
+    if (typeof item.hidden == "function") return item.hidden(props.data)
+    if (typeof item.hidden != "undefined") return item.hidden
+    return true
+  })
+})
 const getLabelWidth = (dataItem: DetailDataItem): string => {
   const labelWidth = typeof dataItem.labelWidth !== "undefined" ? dataItem.labelWidth : props.labelWidth
   const isNum = typeof labelWidth == "number" || (typeof labelWidth == "string" && /^\d+$/.test(labelWidth))

package/components/DetailInfo/src/types.ts

@@ -20,4 +20,5 @@ export interface DetailDataItem {
   labelPosition?: "left" | "right" | "center"
   showOverflowTooltip?: boolean | ElTooltipProps
   rawContent?: boolean
+  hidden?: boolean | ((data: DetailDataItem[]) => boolean)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "60f3b4aec5de066c60333be2f59e84d73d2adcd0"
+  "gitHead": "f7e0bce894e43c52b951fb1cdc7a240b81bca37a"
 }