easybill-ui 1.3.1 → 1.3.3

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

@@ -1,5 +1,5 @@
 <template>
-  <el-cascader v-model="model" :options="options" v-bind="props" v-on="eventObject"></el-cascader>
+  <el-cascader v-model="model" :options="options" v-bind="props.props" v-on="props.eventObject"></el-cascader>
 </template>
 <script lang="ts" setup>
 import { type CascaderOption, type CascaderValue } from "element-plus"

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.props?.slots" :key="key" #[key]="slotScope">
-      <component :is="item" v-model="model" :form-item="props.formItem" :form-model="props.formModel" :props="formItemProps" :event-object="eventObject" />
+      <component :is="item" v-model="model" :form-item="props.formItem" :form-model="props.formModel" :props="props.props" :event-object="eventObject" />
     </template>
   </el-input-number>
 </template>

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

@@ -9,7 +9,7 @@
       </el-option>
     </template>
     <template v-for="(item, key) in props?.slots" :key="key" #[key]>
-      <component :is="item" v-model="model" :form-item="props.formItem" :form-model="props.formModel" :props="props" :event-object="eventObject" />
+      <component :is="item" v-model="model" :formItem="formItem" :formModel="formModel" :props="props" :event-object="eventObject" />
     </template>
   </el-select>
 </template>

package/components/CurdForm/src/components/schema-form-time-picker.vue

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

package/components/FormDialog/src/FormDialog.vue

@@ -20,7 +20,7 @@
         <el-button v-if="cancelBtnTextLabel" :disabled="confirmLoading" type="default" @click="onCancel()">{{ cancelBtnTextLabel }}</el-button>
         <el-button v-if="isGroupMode && hasMultipleSteps && canPrev" :disabled="confirmLoading" type="primary" plain @click="prev()">{{ t("el.formDialog.preStep") }}</el-button>
         <el-button v-if="isGroupMode && hasMultipleSteps && canNext" :disabled="confirmLoading" type="primary" plain @click="next()">{{ t("el.formDialog.nextStep") }}</el-button>
-        <el-button v-if="!isGroupMode || isLastStep" :disabled="confirmLoading" type="primary" :loading="confirmLoading" @click="onOk">{{ confirmBtnTextLabel }}</el-button>
+        <el-button v-if="(!isGroupMode || isLastStep) && confirmBtnTextLabel" :disabled="confirmLoading" type="primary" :loading="confirmLoading" @click="onOk">{{ confirmBtnTextLabel }}</el-button>
       </span>
     </template>
   </component>
@@ -87,11 +87,11 @@ export default defineComponent({
     },
     confirmBtnText: {
       type: String,
-      default: "",
+      default: undefined,
     },
     cancelBtnText: {
       type: String,
-      default: "",
+      default: undefined,
     },
     mode: {
       // 容器组件类型: 'dialog' | 'drawer'
@@ -191,8 +191,8 @@ export default defineComponent({
     if (props.setForm) {
       props.setForm(form)
     }
-    const confirmBtnTextLabel = computed(() => props.confirmBtnText || t("el.formDialog.confirm"))
-    const cancelBtnTextLabel = computed(() => props.cancelBtnText || t("el.formDialog.cancel"))
+    const confirmBtnTextLabel = computed(() => props.confirmBtnText ?? t("el.formDialog.confirm"))
+    const cancelBtnTextLabel = computed(() => props.cancelBtnText ?? t("el.formDialog.cancel"))
     const componentName = computed(() => (props.mode === "drawer" ? "el-drawer" : "el-dialog"))
     const containerProps = computed(() => {
       const baseProps = {

package/components/FormDialog/src/types.ts

@@ -1,6 +1,6 @@
-import type { CurdGroupFormSchema } from "../../CurdGroupForm/types"
 import type { DialogProps, StepProps } from "element-plus"
 import type { Fields, FormContext, FormSchema } from "../../CurdForm"
+import type { CurdGroupFormSchema } from "../../CurdGroupForm/types"
 import type { StepItem } from "./hooks/useStepList"
 
 export interface FormDialogOptions extends Partial<DialogProps> {
@@ -18,6 +18,7 @@ export interface FormDialogOptions extends Partial<DialogProps> {
   cancelBtnText?: string
   stepComponent?: object
   footerComponent?: object
+  mode?: "dialog" | "drawer"
 }
 
 export interface FormDialogContext {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,

package/utils/hooks/useGlobalConfig.ts

@@ -30,7 +30,7 @@ const mergeConfig = (a: GlobalConfig, b: Partial<GlobalConfig>) => {
 }
 
 export interface GlobalConfig {
-  size: "default" | "small" | "large"
+  size?: "default" | "small" | "large"
   form?: FormConfig
   locale?: Language
 }