easybill-ui 1.0.0 → 1.0.2

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)
+      }
       if (typeof sFormSchema.value.getRules == "function") {
         return sFormSchema.value.getRules(formModel, curdFormContext)
       }

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

@@ -1,5 +1,5 @@
 <template>
-  <el-input v-model="model" v-trim :disabled="formItem.disabled || false" v-bind="props" :placeholder="(props.placeholder && String(props.placeholder)) || '请输入' + formItem.label" autocomplete="new-password" v-on="eventObject" />
+  <el-input v-model="model" v-trim :disabled="formItem.disabled || false" v-bind="props" :placeholder="(props.placeholder && String(props.placeholder)) || '请输入' + (props.label || formItem.label)" autocomplete="new-password" v-on="eventObject" />
 </template>
 <script lang="ts">
 import { defineComponent, computed } from "vue"

package/components/CurdForm/src/types.ts

@@ -1,18 +1,24 @@
-import { FormRules, FormItemRule, FormProps, ElForm, TooltipTriggerType } from "element-plus"
+import { FormRules, FormItemRule, ElForm, TooltipTriggerType } from "element-plus"
+import type { Arrayable } from "element-plus/es/utils"
 import { PropType } from "vue"
 import { OptionItem } from "../../ConstantStatus"
 import { defineComponent } from "vue"
-export interface FormSchema extends Partial<FormProps> {
+export interface FormSchema {
   formItem: FormItem[]
-  rules?: FormRules
+  rules?: FormRules | ((formModel: Fields, context: FormContext) => FormRules)
   getRules?: (formModel: Fields, context: FormContext) => FormRules
-  labelPosition?: LabelPosition
+  labelPosition?: "left" | "right" | "top" | string
   gutter?: number
-}
-export enum LabelPosition {
-  LEFT = "left",
-  RIGHT = "right",
-  TOP = "top",
+  labelWidth?: number | string
+  inline?: boolean
+  inlineMessage?: boolean
+  statusIcon?: boolean
+  showMessage?: boolean
+  size?: "default" | "small" | "large" | string
+  disabled?: boolean
+  validateOnRuleChange?: boolean
+  hideRequiredAsterisk?: boolean
+  scrollToError?: boolean
 }
 export interface FormItem {
   prop: string
@@ -24,7 +30,7 @@ export interface FormItem {
   asyncOptions?: (modelRef: Fields, formItem: any, context: FormContext, config?: any) => Promise<Array<CurdFormOptionItem>>
   loading?: boolean
   hidden?: boolean | ((model: Fields) => boolean)
-  rules?: FormItemRule[]
+  rules?: Arrayable<FormItemRule>
   props?: FormItemPropObject | ((formModel: Fields, formItem: any) => FormItemPropObject)
   formItemProps?: FormItemPropObject | ((formModel: Fields, formItem: any) => void)
   labelWidth?: string | number

package/components/CurdTable/src/CurdTable.vue

@@ -366,7 +366,9 @@ const create = (row?: any) => {
     if (rules) {
       let rulesItem: FormItemRule[] = []
       if (!formSchema.rules) formSchema.rules = {}
-      formSchema.rules[item.prop] = rules
+      if (typeof formSchema.rules !== "function") {
+        formSchema.rules[item.prop] = rules
+      }
     }
   }
   columns.value.map((a) => {

package/components/CurdTable/src/types.ts

@@ -112,7 +112,7 @@ export interface PropOption {
   customActivatedFetch: boolean // 自定义执行onActivated内部的fetch执行，完全交由父组件控制
   autoload: boolean
   menuEvent: Partial<Record<MenuEventKey, () => void>>
-  filterAttrs: Partial<FormProps>
+  filterAttrs: Partial<FormSchema>
   formAttrs: FormAttrs
   editOptions: FormDialogOptions
   createOptions: FormDialogOptions

package/components/DetailInfo/src/types.ts

@@ -4,7 +4,7 @@ import { defineComponent } from "vue"
 
 export interface DetailDataItem extends Record<string, any> {
   label?: string
-  value?: string | number | boolean
+  value?: any
   /** 当前项占的宽度，最大24, 默认24 */
   span?: number
   /** 当前数据的选项，里面包含的图标、颜色信息会自动显示 */

package/components/TableFilter/src/FilterExternal/FilterExternal.vue

@@ -1,14 +1,14 @@
 <template>
-  <CurdForm ref="formRef" v-model="query" inline class="filter-external" :form-schema="formSchema" @change="onChange">
+  <CurdForm ref="formRef" v-model="query" inline class="filter-external" :form-schema="formSchema" v-bind="option?.formProps" @change="onChange">
     <template #defaultFilter>
       <slot></slot>
     </template>
   </CurdForm>
 </template>
 <script lang="ts" setup>
-import { ref, watch, PropType } from "vue"
+import { ref, watch, PropType, inject } from "vue"
 import CurdForm from "../../../CurdForm"
-import { ParamsItem, ListQuery } from "../../types"
+import { ParamsItem, ListQuery, FilterOption } from "../../types"
 import { Fields, FormSchema, FormItem } from "../../../CurdForm"
 const props = defineProps({
   selectParams: {
@@ -28,6 +28,7 @@ const props = defineProps({
     default: false,
   },
 })
+const option = inject<FilterOption>("option")
 const query = ref<any>({})
 // 特殊处理数组
 const formItemLeft = props.selectParams.filter((a) => a.external === true || a.external === "left").sort((a, b) => parseInt(String(b.sortIndex || 0)) - parseInt(String(a.sortIndex || 0))) as FormItem[]

package/components/TableFilter/src/TableFilter.vue

@@ -51,6 +51,10 @@ const props = defineProps({
     type: Object as PropType<I.ListQuery>,
     default: undefined,
   },
+  option: {
+    type: Object as PropType<Partial<I.FilterOption>>,
+    default: undefined,
+  },
 })
 const emit = defineEmits(["search"])
 const searchRef = ref()
@@ -174,7 +178,9 @@ const clear = () => {
 }
 // 重新调用selectParams
 const refreshSelectParams = () => {
-  selectParams.value = deepClone(props.schema)
+  if (props.schema) {
+    selectParams.value = deepClone(props.schema)
+  }
 }
 const getCurrentIndex = () => {
   return searchRef.value && searchRef.value.currentIndex
@@ -195,6 +201,7 @@ provide("tableFilter", tableFilterContext)
 provide("state", state)
 provide("selectList", selectList)
 provide("selectParams", selectParams)
+provide("option", props.option)
 defineExpose({ setItem, selectList, loadOptions, clear, refreshSelectParams, getCurrentIndex, listQuery, selectParams })
 onMounted(() => {
   getTags()

package/components/TableFilter/types.ts

@@ -17,3 +17,9 @@ export interface TableFilterContext {
 export interface ListQuery {
   [key: string]: any //string | boolean | number | Array<string> | Array<number>
 }
+export interface FilterOption {
+  formProps: {
+    labelWidth?: string | number
+    labelPosition?: "left" | "right" | "center" | string
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4ea4d1bac2d11c24f74945c3cb559724be417a9d"
+  "gitHead": "6dc20c198be9f3d1c7fde6c788e141eca4146c17"
 }