easybill-ui 1.2.0 → 1.2.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.prop + 'Item']" :required="rules[formItem.prop]?.find((a) => a.hasOwnProperty('required'))?.required" :label="formItem.label" :prop="formItem.prop" :label-width="formItem.labelWidth" :class="getFormItemStyle(formItem)" v-bind="getFormItemProps(formItem)">
+      <el-form-item v-if="!$slots[formItem.prop + 'Item']" :required="rules && rules[formItem.prop]?.find((a) => a.hasOwnProperty('required'))?.required" :label="formItem.label" :prop="formItem.prop" :label-width="formItem.labelWidth" :class="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/FormCompose.vue

@@ -19,16 +19,14 @@ const comp = computed(() => getComponent(props.formItem.type) || (formContext.co
 // console.log(props, "==========props")
 </script>
 <template>
-  <div style="width: 100%">
-    <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"
-      :placeholder="t('el.form.pleaseInput', [formItem.label || ''])"
-      v-bind="props.props"
-      v-on="eventObject"
-    />
-  </div>
+  <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"
+    :placeholder="t('el.form.pleaseInput', [formItem.label || ''])"
+    v-bind="props.props"
+    v-on="eventObject"
+  />
 </template>
 <style scoped lang="scss"></style>

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

@@ -1,5 +1,5 @@
 <template>
-  <component style="width: 100%" v-model="model" :is="h(ElInputNumber, { ...$attrs, ...props, ref: changeRef }, props.formItem?.slots)" :disabled="formItem.disabled || false" :placeholder="t('el.form.pleaseInput', [formItem.label || ''])" v-on="eventObject"></component>
+  <component style="width: 100%" v-model="model" :is="h(ElInputNumber, { ...props.props, ref: changeRef }, props.formItem?.slots)" :placeholder="t('el.form.pleaseInput', [formItem.label || ''])" v-on="eventObject"></component>
 </template>
 <script lang="ts" setup>
 import { useLocale } from "easybill-ui/utils/hooks/useLocal.ts"

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

@@ -1,5 +1,5 @@
 <template>
-  <component v-model="model" :is="withDirectives(h(ElInput, { ...$attrs, ...props, ref: changeRef }, props.formItem?.slots), [[trim, true]])" :disabled="formItem.disabled || false" :placeholder="t('el.form.pleaseInput', [formItem.label || ''])" v-on="eventObject"></component>
+  <component v-model="model" :is="withDirectives(h(ElInput, { ...props.props, ref: changeRef }, props.formItem?.slots), [[trim, true]])" :placeholder="t('el.form.pleaseInput', [formItem.label || ''])" v-on="eventObject"></component>
 </template>
 <script lang="ts" setup>
 import { useLocale } from "easybill-ui/utils/hooks/useLocal.ts"
@@ -11,7 +11,6 @@ const props = defineProps(FormItemProps)
 const { trim } = directives
 const model = defineModel()
 const { t } = useLocale()
-
 const vm = getCurrentInstance()
 function changeRef(el: ElInput) {
   vm.exposed = el || {}

package/index.ts

@@ -8,7 +8,7 @@ import FormDialog from "./components/FormDialog"
 import TableFilter from "./components/TableFilter"
 import { makeInstaller } from "./utils/vue/make-installer"
 
-const Components = [ConstantStatus, FormDialog, CurdForm, CurdTable, TableFilter, DetailInfo, CurdFormItem] as Plugin[]
+const Components = [ConstantStatus, CurdForm, TableFilter, DetailInfo, CurdFormItem, CurdTable, FormDialog] as Plugin[]
 export * from "./components/ConstantStatus/src/types"
 export * from "./components/CurdForm"
 export * from "./components/CurdTable/src/types"
@@ -16,6 +16,6 @@ export * from "./components/DetailInfo/src/types"
 export * from "./components/FormDialog/src/types"
 export * from "./components/TableFilter/types"
 export * from "./utils/hooks/useGlobalConfig"
-export { ConstantStatus, CurdForm, CurdFormItem, CurdTable, DetailInfo, FormDialog, TableFilter }
+export { ConstantStatus, CurdForm, CurdFormItem, DetailInfo, TableFilter, CurdTable, FormDialog}
 
 export default makeInstaller([...Components])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4a0086c675cdb140983538641b10ab0f38df45cb"
+  "gitHead": "69a304abf0094c80e1efdb5bc5e185f8624b1e09"
 }