easybill-ui 1.2.13 → 1.2.15

package/components/CurdForm/src/FormItem.vue

@@ -14,8 +14,6 @@
       </template>
     </component>
 
-    <!-- <FormCompose v-model="modelRef[props.formItem.prop || '']" :props="formItemProps" :form-item="props.formItem" :form-model="modelRef" :event-object="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 && isString(props.formItem.suffix)" class="form-item-suffix" v-html="props.formItem.suffix"></div>
@@ -25,7 +23,6 @@
 <script lang="ts" setup>
 import { computed, type PropType, ref, type Ref } from "vue"
 import { getComponent } from "./components"
-import FormCompose from "./FormCompose.vue"
 import FormTooltip from "./FormTooltip.vue"
 import { useForm } from "./hooks"
 import type { Fields, FormItem } from "./types"

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

@@ -1,7 +1,7 @@
 <template>
   <el-input-number v-model="model" v-bind="props.props" v-on="eventObject">
     <template v-for="(item, key) in props.formItem?.slots" :key="key" #[key]="slotScope">
-      <component :is="item" v-model="modelRef[props.formItem.prop || '']" :form-item="props.formItem" :form-model="modelRef" :props="formItemProps" :event-object="eventObject" />
+      <component :is="item" v-model="model" :form-item="props.formItem" :form-model="props.formModel" :props="formItemProps" :event-object="eventObject" />
     </template>
   </el-input-number>
 </template>

package/components/CurdTable/src/CurdTable.vue

@@ -91,11 +91,10 @@
 
 <script lang="ts" setup>
 import { ArrowDown, Delete, Document, Edit, Plus } from "@element-plus/icons-vue"
-import { useGlobalConfig, useLocale } from "easybill-ui"
+import { FormDialog, useGlobalConfig, useLocale } from "easybill-ui"
 import { ElLoading, ElMessage, ElMessageBox, ElTable } from "element-plus"
 import { computed, getCurrentInstance, onActivated, onMounted, type PropType, provide, reactive, ref, type Ref, watch } from "vue"
 import type { Fields, FormItem, FormSchema } from "../../CurdForm"
-import FormDialog from "../../FormDialog"
 import type { FilterItem, ListQuery } from "../../TableFilter"
 import { deepClone } from "../utils/common"
 import { exportExcel } from "../utils/tabelToExcel"

package/components/DetailInfo/src/types.ts

@@ -15,7 +15,7 @@ export interface DetailDataItem extends Record<string, unknown> {
   props?: Record<string, string>
   slot?: string
   tooltip?: string | import("element-plus/es/components/tooltip").ElTooltipProps
-  labelPosition?: "left" | "right" | "center"
+  labelPosition?: "string" | "left" | "right" | "center"
   labelStyle?: string | Record<string, string | number>
   showOverflowTooltip?: boolean | string | Partial<ElTooltipProps>
   rawContent?: boolean

package/components/FormDialog/src/FormDialog.vue

@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { useLocale } from "easybill-ui"
-import { computed, defineComponent, type PropType, reactive, ref, type Ref, shallowRef, toRefs } from "vue"
+import { computed, defineComponent, type PropType, provide, reactive, ref, type Ref, shallowRef, toRefs } from "vue"
 import { type Fields, type FormSchema } from "../../CurdForm"
 export default defineComponent({
   name: "FormDialog",
@@ -88,7 +88,7 @@ export default defineComponent({
       visible: true,
       confirmLoading: false,
     })
-    const { t, locale } = useLocale()
+    const { t } = useLocale()
     const stepSchemaList = props.stepSchema?.length ? shallowRef(props.stepSchema) : shallowRef([{ name: "step1", description: "", formSchema: props.formSchema }])
     const prev = () => {
       if (state.step > 0) {
@@ -156,7 +156,16 @@ export default defineComponent({
     }
     const confirmBtnTextLabel = computed(() => props.confirmBtnText || t("el.formDialog.confirm"))
     const cancelBtnTextLabel = computed(() => props.cancelBtnText || t("el.formDialog.cancel"))
-
+    const formDialogContext = reactive({
+      form,
+      state,
+      loadOptions,
+      prev,
+      next,
+      close: onBeforeClose,
+      handleOk: onOk,
+    })
+    provide("formDialogContext", formDialogContext)
     return {
       ...toRefs(state),
       onOk,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.2.13",
+  "version": "1.2.15",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a31099789b92ed5e6b45ecfbd4a81aa311466950"
+  "gitHead": "7b32f2606de729a1c90dedb105801267ab60f591"
 }

package/components/CurdForm/src/FormCompose.vue

@@ -1,24 +0,0 @@
-<script setup lang="ts">
-import { useLocale } from "easybill-ui"
-import { type Component, computed, getCurrentInstance, h } from "vue"
-import { getComponent } from "./components"
-import { useForm } from "./hooks"
-import { FormItemProps } from "./types"
-const props = defineProps(FormItemProps)
-const model = defineModel()
-const { t } = useLocale()
-const vm = getCurrentInstance()
-function changeRef(el: Component) {
-  // console.log(el, "el")
-  vm.exposed = el || {}
-  vm.exposedProxy = el || {}
-}
-const { formContext } = useForm()
-const comp = computed(() => (formContext.components && formContext.components[props.formItem.type]) || getComponent(props.formItem.type))
-
-// console.log(props, "==========props")
-</script>
-<template>
-  <component style="width: 100%" :ref="changeRef" :is="typeof comp === 'string' ? comp : h(comp, { ...$attrs, ...props, ref: changeRef, modelValue: model }, props.formItem?.slots)" v-model="model" v-bind="props.props" />
-</template>
-<style scoped lang="scss"></style>