easybill-ui 1.0.15 → 1.0.17

package/components/CurdForm/src/FormItem.vue

@@ -17,7 +17,8 @@ import { FormItem, Fields } from "./types"
 import { getComponent } from "./components"
 import FormTooltip from "./FormTooltip.vue"
 import { useForm } from "./hooks"
-
+import { useGlobalConfig } from "../../../utils/hooks/useGlobalConfig"
+const config = useGlobalConfig()
 const props = defineProps({
   // 动态验证表单
   formItem: {
@@ -31,7 +32,7 @@ const props = defineProps({
 })
 const emit = defineEmits(["change"])
 const modelRef: Ref<Fields> = ref(props.formModel || {})
-const comp = computed(() => getComponent(props.formItem.type))
+const comp = computed(() => getComponent(props.formItem.type) || (config.value.form && config.value.form.components && config.value.form.components[props.formItem.type]))
 // 重新组装props
 const formItemProps = computed(() => {
   if (!props.formItem.props) {

package/components/CurdForm/src/components/schema-form-tree-select.vue

@@ -13,7 +13,7 @@
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, computed, PropType, toRaw } from "vue"
+import { defineComponent, computed, toRaw } from "vue"
 import { Loading, Warning } from "@element-plus/icons-vue"
 import { ElTreeSelect, ElIcon } from "element-plus"
 import { FormItemProps } from "../types"
@@ -23,8 +23,8 @@ export default defineComponent({
   props: {
     ...FormItemProps,
     modelValue: {
-      type: Array as PropType<(string | number)[]>,
-      default: () => [],
+      type: [String, Number, Boolean],
+      default: "",
     }, // 表单项值
   },
   emits: ["update:modelValue"],
@@ -33,9 +33,6 @@ export default defineComponent({
       get: () => props.modelValue,
       set: (val) => emit("update:modelValue", val),
     })
-    if (!(model.value instanceof Array)) {
-      model.value = []
-    }
 
     return {
       model,

package/index.ts

@@ -1,7 +1,8 @@
 import type { Plugin } from "vue"
 import ConstantStatus from "./components/ConstantStatus"
 import FormDialog from "./components/FormDialog"
-import CurdForm, { CurdFormItem } from "./components/CurdForm"
+import CurdForm from "./components/CurdForm"
+import CurdFormItem from "./components/CurdForm/src/CurdFormItem.vue"
 import CurdTable from "./components/CurdTable"
 import TableFilter from "./components/TableFilter"
 import DetailInfo from "./components/DetailInfo"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "89c3817a8770757734e0496bb5de89ddb9544f59"
+  "gitHead": "fe7feba742765b8f0348ad4c39cbb97c51699de4"
 }

package/utils/hooks/useGlobalConfig.ts

@@ -23,4 +23,8 @@ const mergeConfig = (a: any, b: any): any => {
 
 export interface GlobalConfig {
   size: "default" | "small" | "medium"
+  form?: FormConfig
+}
+interface FormConfig {
+  components?: any[]
 }