ele-admin-plus 1.4.1-beta.1 → 1.4.1

package/lib/ele-modal/style/index.scss

@@ -39,6 +39,11 @@
       }
     }
   }
+
+  &.dialog-fade-enter-active .el-overlay-dialog *,
+  &.dialog-fade-leave-active .el-overlay-dialog * {
+    pointer-events: none !important;
+  }
 }
 
 /* header */
@@ -59,6 +64,11 @@
   box-sizing: border-box;
 }
 
+.is-show-header-border > .el-dialog__header > .ele-modal-header {
+  padding: eleVar('modal', 'bordered-header-padding');
+  border-bottom: eleVar('modal', 'bordered-header-border');
+}
+
 /* 图标按钮 */
 .ele-modal-tool {
   flex-shrink: 0;
@@ -90,6 +100,12 @@
   padding: eleVar('modal', 'body-padding');
   box-sizing: border-box;
 
+  &.is-fluid-body {
+    max-height: 100%;
+    min-height: 100%;
+    overflow: auto;
+  }
+
   &.is-form {
     padding: eleVar('modal', 'form-body-padding');
   }

package/lib/ele-pro-form/components/item-type-data.cjs

@@ -218,9 +218,8 @@ const defaultItemTypeData = [
   {
     type: "input",
     component: vue.markRaw(elementPlus.ElInput),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -231,9 +230,8 @@ const defaultItemTypeData = [
   {
     type: "textarea",
     component: vue.markRaw(elementPlus.ElInput),
-    defaultProps: ({ item }) => ({
-      rows: 4,
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      rows: 4
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       type: "textarea",
@@ -245,10 +243,9 @@ const defaultItemTypeData = [
   {
     type: "select",
     component: vue.markRaw(EleSelect),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -258,10 +255,9 @@ const defaultItemTypeData = [
   {
     type: "multipleSelect",
     component: vue.markRaw(EleSelect),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -306,10 +302,9 @@ const defaultItemTypeData = [
   {
     type: "date",
     component: vue.markRaw(elementPlus.ElDatePicker),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      valueFormat: "YYYY-MM-DD",
-      placeholder: `请选择${item.label ?? ""}`
+      valueFormat: "YYYY-MM-DD"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -319,10 +314,9 @@ const defaultItemTypeData = [
   {
     type: "datetime",
     component: vue.markRaw(elementPlus.ElDatePicker),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      placeholder: `请选择${item.label ?? ""}`
+      valueFormat: "YYYY-MM-DD HH:mm:ss"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       type: "datetime",
@@ -337,8 +331,6 @@ const defaultItemTypeData = [
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD",
       rangeSeparator: "-",
-      startPlaceholder: "开始日期",
-      endPlaceholder: "结束日期",
       unlinkPanels: true,
       type: "daterange"
     }),
@@ -354,8 +346,6 @@ const defaultItemTypeData = [
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD HH:mm:ss",
       rangeSeparator: "-",
-      startPlaceholder: "开始日期",
-      endPlaceholder: "结束日期",
       unlinkPanels: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -367,10 +357,9 @@ const defaultItemTypeData = [
   {
     type: "time",
     component: vue.markRaw(elementPlus.ElTimePicker),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      valueFormat: "HH:mm:ss",
-      placeholder: `请选择${item.label ?? ""}`
+      valueFormat: "HH:mm:ss"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -383,9 +372,7 @@ const defaultItemTypeData = [
     defaultProps: () => ({
       class: "ele-fluid",
       valueFormat: "HH:mm:ss",
-      rangeSeparator: "-",
-      startPlaceholder: "开始日期",
-      endPlaceholder: "结束日期"
+      rangeSeparator: "-"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       isRange: true,
@@ -396,9 +383,8 @@ const defaultItemTypeData = [
   {
     type: "timeSelect",
     component: vue.markRaw(elementPlus.ElTimeSelect),
-    defaultProps: ({ item }) => ({
-      class: "ele-fluid",
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      class: "ele-fluid"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -420,10 +406,9 @@ const defaultItemTypeData = [
   {
     type: "inputNumber",
     component: vue.markRaw(elementPlus.ElInputNumber),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      controlsPosition: "right",
-      placeholder: `请输入${item.label ?? ""}`
+      controlsPosition: "right"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -433,9 +418,8 @@ const defaultItemTypeData = [
   {
     type: "autocomplete",
     component: vue.markRaw(EleAutocomplete),
-    defaultProps: ({ item }) => ({
-      class: "ele-fluid",
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      class: "ele-fluid"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -445,10 +429,9 @@ const defaultItemTypeData = [
   {
     type: "cascader",
     component: vue.markRaw(EleCascader),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -458,10 +441,9 @@ const defaultItemTypeData = [
   {
     type: "multipleCascader",
     component: vue.markRaw(EleCascader),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -497,9 +479,8 @@ const defaultItemTypeData = [
   {
     type: "mention",
     component: vue.markRaw(EleMention),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -525,10 +506,9 @@ const defaultItemTypeData = [
   {
     type: "treeSelect",
     component: vue.markRaw(EleSelectTree),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -538,11 +518,10 @@ const defaultItemTypeData = [
   {
     type: "treeMultipleSelect",
     component: vue.markRaw(EleSelectTree),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
       clearable: true,
-      showCheckbox: true,
-      placeholder: `请选择${item.label ?? ""}`
+      showCheckbox: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -553,9 +532,8 @@ const defaultItemTypeData = [
   {
     type: "virtualTreeSelect",
     component: vue.markRaw(EleTreeSelect),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -565,10 +543,9 @@ const defaultItemTypeData = [
   {
     type: "virtualTreeMultipleSelect",
     component: vue.markRaw(EleTreeSelect),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       clearable: true,
-      maxTagCount: 1,
-      placeholder: `请选择${item.label ?? ""}`
+      maxTagCount: 1
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -579,9 +556,8 @@ const defaultItemTypeData = [
   {
     type: "tableSelect",
     component: vue.markRaw(EleTableSelect),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -591,9 +567,8 @@ const defaultItemTypeData = [
   {
     type: "tableMultipleSelect",
     component: vue.markRaw(EleTableSelect),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,

package/lib/ele-pro-form/index.d.ts

@@ -1,6 +1,6 @@
 import { ElFormInstance } from '../ele-app/el';
 import { ChildrenRenderInstance } from './components/render-util';
-import { ProFormItemProps, ProFormItemKey, ProFormLocale } from './types';
+import { ProFormItemProps, ProFormItemKey } from './types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
     topExtra?(_: {}): any;
@@ -38,7 +38,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<import('./types').ProFormItemTypeData[]>;
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
-    locale: import('vue').PropType<Partial<ProFormLocale>>;
+    locale: import('vue').PropType<Partial<import('./types').ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
         readonly type: import('vue').PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
@@ -156,7 +156,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<import('./types').ProFormItemTypeData[]>;
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
-    locale: import('vue').PropType<Partial<ProFormLocale>>;
+    locale: import('vue').PropType<Partial<import('./types').ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
         readonly type: import('vue').PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;