easybill-ui 0.1.0 → 0.1.2

package/components/CurdForm/src/CurdForm.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="schemaFormRef" :model="formModel" :rules="rules" v-bind="{ ...$attrs, ...getFormProps }" class="curd-form" :style="getFormStyle()" @submit.prevent>
     <template v-for="formItem in schemaItems" :key="formItem.prop">
-      <el-form-item v-if="!$slots[formItem.type + 'Item']" :label="formItem.label" :prop="formItem.prop" :label-width="formItem.labelWidth" :style="getFormItemStyle(formItem)" v-bind="getFormItemProps(formItem)">
+      <el-form-item v-if="!$slots[formItem.prop + 'Item']" :label="formItem.label" :prop="formItem.prop" :label-width="formItem.labelWidth" :style="getFormItemStyle(formItem)" v-bind="getFormItemProps(formItem)">
         <slot :name="formItem.prop" :form-item="formItem" :form-model="formModel"></slot>
         <FormItem v-if="!(formItem.prop && $slots[formItem.prop])" :form-item="formItem" :form-model="formModel" @change="onChange">
           <template #prefix>

package/components/CurdForm/src/FormItem.vue

@@ -2,14 +2,15 @@
   <div class="form-item">
     <div v-if="props.formItem.prefix" class="form-item-prefix" v-html="props.formItem.prefix"></div>
     <slot name="prefix"></slot>
-    <component :is="getComponent(props.formItem.type)" v-if="!(props.formItem.type && $slots[props.formItem.type])" v-model="modelRef[props.formItem.prop || '']" :form-item="props.formItem" :form-model="modelRef" :props="formItemProps" :event-object="eventObject" />
+    <component :is="comp" v-if="comp" v-model="modelRef[props.formItem.prop || '']" :form-item="props.formItem" :form-model="modelRef" :props="formItemProps" :event-object="eventObject" />
+    <component :is="props.formItem.type" v-else v-model="modelRef[props.formItem.prop || '']" v-bind="formItemProps" v-on="eventObject" />
     <FormTooltip v-if="props.formItem.tooltip" :tooltip="props.formItem.tooltip" :form-item="props.formItem" :form-model="props.formModel" />
     <slot name="suffix"></slot>
     <div v-if="props.formItem.suffix" class="form-item-suffix" v-html="props.formItem.suffix"></div>
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, computed, getCurrentInstance, Ref, PropType } from "vue"
+import { ref, computed, Ref, PropType } from "vue"
 import { FormItem, Fields } from "./types"
 import { getComponent } from "./components"
 import FormTooltip from "./FormTooltip.vue"
@@ -28,6 +29,7 @@ const props = defineProps({
 })
 const emit = defineEmits(["change"])
 const modelRef: Ref<Fields> = ref(props.formModel || {})
+const comp = computed(() => getComponent(props.formItem.type))
 // 重新组装props
 const formItemProps = computed(() => {
   if (!props.formItem.props) {

package/components/CurdForm/src/components/index.ts

@@ -9,6 +9,7 @@ import SchemaFormTimePicker from "./schema-form-time-picker.vue"
 import SchemaFormColorPicker from "./schema-form-color-picker.vue"
 import SchemaFormValue from "./schema-form-value.vue"
 import SchemaFormCascader from "./schema-form-cascader.vue"
+import SchemaFormAutocomplete from "./schema-form-autocomplete.vue"
 import { isReactive, isRef, createVNode, isVNode } from "vue"
 interface PresetMap {
   [key: string]: any
@@ -25,6 +26,7 @@ const presetMap: PresetMap = {
   "schema-color-picker": SchemaFormColorPicker,
   "schema-value": SchemaFormValue,
   "schema-cascader": SchemaFormCascader,
+  "schema-autocomplete": SchemaFormAutocomplete,
 }
 
 export default presetMap

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

@@ -0,0 +1,25 @@
+<template>
+  <el-autocomplete v-model="model" v-bind="props.props" v-on="props.eventObject">
+    <template #default="{ item }">
+      <div v-if="item.html" v-html="item.html"></div>
+      <div v-else>{{ item.label || item.value }}</div>
+    </template>
+  </el-autocomplete>
+</template>
+<script lang="ts" setup>
+import { computed, PropType } from "vue"
+import { ElCascader, CascaderOption, CascaderValue } from "element-plus"
+import { FormItemProps } from "easybill-ui/components/CurdForm/src/types"
+const props = defineProps({
+  ...FormItemProps,
+  modelValue: {
+    type: [String, Number] as PropType<CascaderValue>,
+    default: undefined,
+  }, // 表单项值
+})
+const emits = defineEmits(["update:modelValue"])
+const model = computed({
+  get: () => props.modelValue,
+  set: (val) => emits("update:modelValue", val),
+})
+</script>

package/components/CurdForm/src/types.ts

@@ -27,6 +27,8 @@ export interface FormItem {
   disabled?: boolean
   tooltip?: string
   autoload?: boolean
+  prefix?: string
+  suffix?: string
 }
 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/CurdTable/src/STableFilter.vue

@@ -46,5 +46,5 @@ const getCurrentTableFilterProp = () => {
     return selectParams.value[tableFilterRef.value.getCurrentIndex()].prop
   }
 }
-defineExpose({ setItem, getSelectList, loadOptions, clear, refreshSelectParams, getCurrentTableFilterProp })
+defineExpose({ filterRef: tableFilterRef, setItem, getSelectList, loadOptions, clear, refreshSelectParams, getCurrentTableFilterProp })
 </script>

package/components/CurdTable/src/types.ts

@@ -100,7 +100,7 @@ export interface FeachDataParam {
 
 export interface DetailDataItem {
   label: string
-  value: string
+  value: any
   /** 当前项占的宽度，最大24, 默认24 */
   span?: number
   /** 当前数据的选项，里面包含的图标、颜色信息会自动显示 */

package/components/TableFilter/src/TableFilter.vue

@@ -181,6 +181,6 @@ const tableFilterContext = reactive<I.TableFilterContext>({
 provide("tableFilter", tableFilterContext)
 provide("state", state)
 provide("selectList", selectList)
-defineExpose({ setItem, selectList, loadOptions, clear, refreshSelectParams, getCurrentIndex })
+defineExpose({ setItem, selectList, loadOptions, clear, refreshSelectParams, getCurrentIndex, listQuery, selectParams })
 getTags()
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "20250696a8d4cbd888728e8d2f34737b5975503a"
+  "gitHead": "d7fedb90ece256b251f72e382263813efc61e668"
 }