easybill-ui 0.1.1 → 0.1.2

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

@@ -40,6 +40,6 @@ export const getComponent = (type = "input") => {
     return createVNode(type)
   } else {
     // 不识别组件
-    return type
+    return null
   }
 }

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

@@ -1,5 +1,5 @@
 <template>
-  <el-autocomplete v-model="model" v-bind="props" v-on="eventObject">
+  <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>

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.1",
+  "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": "4e76935a08a07f4e2b3eea6066e988537e612370"
+  "gitHead": "d7fedb90ece256b251f72e382263813efc61e668"
 }