@vue-start/pro 0.5.34 → 0.5.36

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 0.5.36
+
+- ProTable 新增 toolbar 高度计算，值为 css 变量：--pro-table-toolbar-hei；
+- ProLayout Scroll 组件支持（element-plus）；
+- ProPage Scroll 组件支持（element-plus）；pro-page-sub 模式（支持 PageCurd 场景）
+
 # 0.5.33
 
 - ProTable 新增 mergeOpts 属性，支持行、列合并

package/dist/index.css

@@ -1,26 +1,32 @@
 :root {
   /***************layout****************/
+  /*header高度*/
   --pro-header-hei: 60px;
+  /*header与内容间隔*/
   --pro-divide-ver-hei: 2px;
+  /*面包屑高度*/
+  --pro-bread-hei: 0px;
+  /*菜单宽度变量：合并/展开会重新赋值；媒体查询重新赋值*/
   --pro-left-menu-wid: 220px;
-  --pro-left-menu-mini-wid: 64px;
   /*左侧菜单start,end插槽高度*/
   --pro-menu-start-hei: 0px;
   --pro-menu-end-hei: 0px;
-  /*左侧菜单高度*/
-  --pro-left-menu-hei: calc(100vh - var(--pro-menu-start-hei) - var(--pro-menu-end-hei));
   /*page*/
   --pro-page-header-hei: 40px;
   --pro-page-footer-hei: 46px;
 
   /*color*/
   --pro-color-primary: #1890ff;
+  --pro-color-bg: #f8f8f8;
 }
 
 /********************************** pro-layout ***********************************/
 
 .pro-layout {
+  /*section高度*/
   --pro-secion-hei: calc(100vh - var(--pro-header-hei) - var(--pro-divide-ver-hei));
+  /*左侧菜单高度*/
+  --pro-left-menu-hei: calc(var(--pro-secion-hei) - var(--pro-menu-start-hei) - var(--pro-menu-end-hei));
 }
 
 .pro-layout .pro-layout-header {
@@ -46,42 +52,55 @@
   border-bottom: unset;
 }
 
-.pro-layout .pro-layout-section {
-  margin-top: var(--pro-divide-ver-hei);
-  height: var(--pro-secion-hei);
+/*左侧菜单*/
+
+.pro-layout .pro-layout-menus-scroll {
+  height: var(--pro-left-menu-hei);
+  overflow-y: auto;
 }
 
-/*左侧菜单*/
 .pro-layout .pro-layout-menus-wrapper .pro-layout-menus {
   width: var(--pro-left-menu-wid);
   min-width: var(--pro-left-menu-wid);
   max-width: var(--pro-left-menu-wid);
-  overflow-y: auto;
-  overflow-x: hidden;
 }
 
 .pro-layout .pro-layout-menus-wrapper .mini {
-  width: var(--pro-left-menu-mini-wid);
-  min-width: var(--pro-left-menu-mini-wid);
-  max-width: var(--pro-left-menu-mini-wid);
+  --pro-left-menu-wid: 64px;
+}
+
+/*section*/
+.pro-layout .pro-layout-section {
+  height: var(--pro-secion-hei);
+  overflow: auto;
+  position: relative;
+  box-sizing: border-box;
 }
 
 /*vertical*/
 .pro-layout-vertical {
 }
 
+.pro-layout-vertical .pro-layout-section {
+  margin-top: var(--pro-divide-ver-hei);
+}
+
 /*horizontal*/
 
 .pro-layout-horizontal {
   display: flex;
 }
 
-.pro-layout-horizontal .pro-layout-menus {
-  height: var(--pro-left-menu-hei);
+.pro-layout-horizontal .pro-layout-menus-scroll {
+  --pro-left-menu-hei: calc(100vh - var(--pro-menu-start-hei) - var(--pro-menu-end-hei));
 }
 
 .pro-layout-horizontal .pro-layout-structure {
-  flex-grow: 1;
+  flex: 1;
+}
+
+.pro-layout-horizontal .pro-layout-section {
+  margin-top: var(--pro-divide-ver-hei);
 }
 
 /*horizontal-v*/
@@ -89,12 +108,9 @@
   display: unset !important;
 }
 
-.pro-layout-horizontal-v .pro-layout-menus {
-  height: calc(var(--pro-left-menu-hei) - var(--pro-header-hei) - var(--pro-divide-ver-hei));
-}
-
 .pro-layout-horizontal-v .pro-layout-structure {
   display: flex;
+  margin-top: var(--pro-divide-ver-hei);
 }
 
 .pro-layout-horizontal-v .pro-layout-structure .pro-layout-section {
@@ -108,11 +124,7 @@
 
 .pro-layout-compose .pro-layout-structure {
   display: flex;
-}
-
-.pro-layout-compose .pro-layout-structure .pro-layout-menus {
   margin-top: var(--pro-divide-ver-hei);
-  height: calc(var(--pro-left-menu-hei) - var(--pro-header-hei) - var(--pro-divide-ver-hei));
 }
 
 .pro-layout-compose .pro-layout-structure .pro-layout-section {
@@ -210,6 +222,15 @@
   box-sizing: border-box;
 }
 
+.pro-page-sub {
+  position: absolute !important;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  /*overflow-y: auto;*/
+}
+
 .pro-page-header {
   height: var(--pro-page-header-hei);
   display: flex;

package/dist/index.d.ts

@@ -176,6 +176,10 @@ declare type TObjItem = {
 declare type TFunItem = (string | TParamItem | TObjItem)[];
 declare type TExpression = TFunItem | TDataType | TObjItem;
 
+/**
+ *  渲染后的插槽是否是有效的vnode
+ */
+declare const isValidNode: (vns?: VNode[]) => boolean;
 /**
  * 获取Column的valueType，默认"text"
  * @param column
@@ -1526,6 +1530,9 @@ declare const proPageProps: () => {
         type: BooleanConstructor;
         default: boolean;
     };
+    as: {
+        type: StringConstructor;
+    };
 };
 declare type ProPageProps = Partial<ExtractPropTypes<ReturnType<typeof proPageProps>>> & PageHeaderProps;
 declare const ProPage: vue.DefineComponent<ProPageProps, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<ProPageProps>, {}>;
@@ -2178,6 +2185,7 @@ declare const ElementKeys: {
     CheckboxKey: string;
     MenusKey: string;
     ModalKey: string;
+    ScrollKey: string;
     FormKey: string;
     FormItemKey: string;
     TableKey: string;
@@ -2330,6 +2338,18 @@ declare const modalCurdProps: () => {
     };
 };
 declare type ModalCurdProps = Partial<ExtractPropTypes<ReturnType<typeof modalCurdProps>>>;
+/**
+ * 事件处理
+ */
+declare const ModalCurdOpe: vue.DefineComponent<Partial<ExtractPropTypes<{
+    defaultAddRecord: {
+        type: PropType<Record<string, any>>;
+    };
+}>>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<ExtractPropTypes<Partial<ExtractPropTypes<{
+    defaultAddRecord: {
+        type: PropType<Record<string, any>>;
+    };
+}>>>>, {}>;
 declare type ProModalCurdProps = ModalCurdProps & ProCurdProps;
 declare const ProModalCurd: vue.DefineComponent<ProModalCurdProps, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<ProModalCurdProps>, {}>;
 
@@ -2467,4 +2487,4 @@ declare const getSignValue: <T = any>(item: TColumn, signName: string) => T;
  */
 declare const filterSlotsByPrefix: (slots: Record<string, any>, prefix: string) => lodash.Dictionary<any>;
 
-export { AddButton, BooleanObjType, BooleanRulesObjType, ColumnSetting, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, ElementKeys, FieldNames, FormAction, FormItemProps, FormRulePrefixMap, IAccess, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOpeItem, IOperateItem, IPer, IProConfigProvide, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, IUser, InternalNamePath, LogonUser, LogonUserKey, MustLogon, NamePath, PageHeaderProps, PaginationSlotProps, PerSuffix, Permission, PermissionProps, ProBaseProps, ProColumnSettingProps, ProConfig, ProConfigProps, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdDescProps, ProCurdForm, ProCurdFormConnect, ProCurdFormProps, ProCurdList, ProCurdListConnect, ProCurdListProps, ProCurdModal, ProCurdModalForm, ProCurdModalFormConnect, ProCurdModalProps, ProCurdProps, ProDesc, ProDescProps, ProDispatchRequestType, ProForm, ProFormItemProps, ProFormList, ProFormListProps, ProFormProps, ProGrid, ProGridProps, ProLayout, ProList, ProListProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProOperate, ProOperateProps, ProPage, ProPageCurd, ProPageCurdProps, ProPageProps, ProSearchForm, ProSearchFormProps, ProShowDate, ProShowDigit, ProShowOptions, ProShowText, ProShowTree, ProTable, ProTableProps, ProTypography, ProTypographyProps, ProUploadList, ProUploaderText, RequestAction, RouterMethods, SearchMode, SearchSlotProps, TAccess, TActionEvent, TActionState, TColumn, TColumns, TConfigData, TCurdActionEvent, TDefaultValueType, TElementMap, TExecuteFunName, TExecuteItem, TExecuteName, TFile, TFormExtraMap, TInitialState, TLogonUserProvide, TMeta, TOpenMenu, TOption, TOptions, TPageState, TProFormOperate, TRegisterStore, TRegisterStoreMap, TRender, TRouter, TTableColumn, TTableColumns, TValueType, TreeOption, TreeOptions, Wrapper, convertPathToList, convertResData, createExpose, createExposeObj, createFormItemCompFn, createModule, createProConfig, defaultPage, filterSlotsByPrefix, getColumnFormItemName, getColumnValueType, getFirstPropName, getRealRender, getSignValue, getValidValues, isValidConfig, mergeState, mergeStateToList, proBaseProps, provideProCurd, provideProFormList, provideProModule, renderColumn, renderElement, renderElements, renderInputColumn, useAccess, useAccessMgr, useComposeRequestActor, useDispatchMeta, useDispatchStore, useDoneRequestActor, useFailedRequestActor, useFormSubmit, useGetCompByKey, useHasPer, useHasPer2, useLogonUser, useMetaRegister, useModuleEvent, useProConfig, useProCurd, useProForm, useProFormList, useProModal, useProModule, useProMsg, useProNotify, useProRouter, useProTable, useReadStore };
+export { AddButton, BooleanObjType, BooleanRulesObjType, ColumnSetting, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, ElementKeys, FieldNames, FormAction, FormItemProps, FormRulePrefixMap, IAccess, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOpeItem, IOperateItem, IPer, IProConfigProvide, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, IUser, InternalNamePath, LogonUser, LogonUserKey, ModalCurdOpe, MustLogon, NamePath, PageHeaderProps, PaginationSlotProps, PerSuffix, Permission, PermissionProps, ProBaseProps, ProColumnSettingProps, ProConfig, ProConfigProps, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdDescProps, ProCurdForm, ProCurdFormConnect, ProCurdFormProps, ProCurdList, ProCurdListConnect, ProCurdListProps, ProCurdModal, ProCurdModalForm, ProCurdModalFormConnect, ProCurdModalProps, ProCurdProps, ProDesc, ProDescProps, ProDispatchRequestType, ProForm, ProFormItemProps, ProFormList, ProFormListProps, ProFormProps, ProGrid, ProGridProps, ProLayout, ProList, ProListProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProOperate, ProOperateProps, ProPage, ProPageCurd, ProPageCurdProps, ProPageProps, ProSearchForm, ProSearchFormProps, ProShowDate, ProShowDigit, ProShowOptions, ProShowText, ProShowTree, ProTable, ProTableProps, ProTypography, ProTypographyProps, ProUploadList, ProUploaderText, RequestAction, RouterMethods, SearchMode, SearchSlotProps, TAccess, TActionEvent, TActionState, TColumn, TColumns, TConfigData, TCurdActionEvent, TDefaultValueType, TElementMap, TExecuteFunName, TExecuteItem, TExecuteName, TFile, TFormExtraMap, TInitialState, TLogonUserProvide, TMeta, TOpenMenu, TOption, TOptions, TPageState, TProFormOperate, TRegisterStore, TRegisterStoreMap, TRender, TRouter, TTableColumn, TTableColumns, TValueType, TreeOption, TreeOptions, Wrapper, convertPathToList, convertResData, createExpose, createExposeObj, createFormItemCompFn, createModule, createProConfig, defaultPage, filterSlotsByPrefix, getColumnFormItemName, getColumnValueType, getFirstPropName, getRealRender, getSignValue, getValidValues, isValidConfig, isValidNode, mergeState, mergeStateToList, proBaseProps, provideProCurd, provideProFormList, provideProModule, renderColumn, renderElement, renderElements, renderInputColumn, useAccess, useAccessMgr, useComposeRequestActor, useDispatchMeta, useDispatchStore, useDoneRequestActor, useFailedRequestActor, useFormSubmit, useGetCompByKey, useHasPer, useHasPer2, useLogonUser, useMetaRegister, useModuleEvent, useProConfig, useProCurd, useProForm, useProFormList, useProModal, useProModule, useProMsg, useProNotify, useProRouter, useProTable, useReadStore };