el-plus-crud 0.1.39 → 0.1.40

package/lib/components/el-plus-form/ElPlusForm.vue

@@ -6,7 +6,7 @@
         <el-row :gutter="10" v-for="(formList, index) in attrMapToTableList" :key="index" :style="{ marginRight: isTable ? '20px' : 0 }">
           <el-col v-for="(formItem, y) in formList" :key="index + '-' + y + '-' + formItem.field" :xs="24" :sm="24" :md="formItem.colspan && formItem.colspan >= column ? 24 : column >= 2 ? 12 : 24" :lg="formItem.colspan && formItem.colspan >= column ? 24 : Math.floor((24 / column) * (formItem.colspan || 1))" :xl="formItem.colspan && formItem.colspan >= column ? 24 : Math.floor((24 / column) * (formItem.colspan || 1))">
             <div v-if="formItem._vif" class="el-plus-form-column-panel" :style="{ 'justify-content': isTable ? 'flex-end' : 'flex-start' }">
-              <el-form-item style="min-height: 40px; display: flex" :prop="formItem.field" :style="{ width: formItem._attrs?.width || formItem.width || (isTable ? '150px' : '100%') }">
+              <el-form-item style="min-height: 40px; display: flex" :prop="formItem.field" :style="{ width: formItem._attrs?.width || formItem.width || (isTable ? '150px' : '100%'), marginBottom: itemMB }">
                 <template #label>
                   <div v-if="showLabel && formItem.showLabel !== false" class="crud-form-label" :style="{ width: formItem.labelWidth || computedFormAttrs._labelWidth || (isDialog ? '100px' : '120px') }">
                     <span :class="{ required: formItem.required }">
@@ -110,6 +110,8 @@ export interface IFormProps {
   isGroupForm?: boolean
   // 是否禁用最后一个元素的tab
   disabledTab?: boolean
+  // item的底部边距
+  itemMB?: string
   // 比如 beforeValidate, beforeRequest, success, requestError, requestEnd
   // 其他钩子 直接放到attrs里面去了
 }
@@ -168,7 +170,9 @@ const props = withDefaults(defineProps<IFormProps>(), {
   // 唯一标识符。默认为id
   idKey: 'id',
   // 是否禁用最后一个元素的tab
-  disabledTab: false
+  disabledTab: false,
+  // item的底部边距
+  itemMB: '18px'
   // 其他钩子 直接放到attrs里面去了
   // 比如 beforeValidate, beforeRequest, success, requestError, requestEnd
 })
@@ -447,6 +451,7 @@ const btnList = computed(() => {
         label: props.submitBtnText || '提交',
         size: size.value,
         type: 'primary',
+        disabled: props.disabled,
         loading: props.isLoading || innerIsLoading.value,
         on: { click: handleSubmitForm }
       }
@@ -885,7 +890,6 @@ defineExpose({ fid: props.fid, formRef: refElPlusForm, submit: handleSubmitForm,
   }
   .el-plus-form-column-panel {
     & > .el-form-item {
-      margin-bottom: 18px !important;
       // & > .el-form-item__label-wrap {
       & > .el-form-item__label {
         line-height: 40px;

package/lib/components/el-plus-form/components/ElPlusFormTree.vue

@@ -63,7 +63,6 @@ function handelCheckChange(item: any, isSelect: boolean) {
     // 这里判断一下全选状态
     selectAll.value = isSelect && allIds.value.length === currentValue.value?.length
     emits('validateThis')
-    console.log('validateThis******************')
   })
 }
 

package/lib/components/el-plus-table/ElPlusTable.vue

@@ -424,7 +424,7 @@ async function loadExpandData(row: any, treeNode: any, resolve: any) {
   postData[props.tableConfig?.explan?.idName || 'parentId'] = row.id
   props.tableConfig.fetch &&
     props.tableConfig.fetch(postData).then((pageInfo) => {
-      resolve(pageInfo?.[props.tableConfig?.fetchMap?.list || 'records'])
+      resolve(pageInfo?.[defaultConf.table?.list || props.tableConfig?.fetchMap?.list || 'records'])
     })
 }
 
@@ -531,8 +531,8 @@ async function getListQueryData() {
   } as any
   if (props.isPager) {
     // 封装分页信息
-    queryMap.current = pageInfo.current
-    queryMap.size = pageInfo.size
+    queryMap[defaultConf.table?.page?.current || props.tableConfig?.fetchMap?.page?.current || 'current'] = pageInfo.current
+    queryMap[defaultConf.table?.page?.pageSize || props.tableConfig?.fetchMap?.page?.pageSize || 'size'] = pageInfo.size
   }
   // 这里处理一下列表Tab的查询条件
   if (props.tableConfig?.tabConf && props.tableConfig?.tabConf?.prop) {
@@ -659,16 +659,16 @@ async function loadData(isInit: Boolean) {
     let dataPage = ((await props.tableConfig.fetch(postData)) || {}) as any
     // 这里要进行赋值操作-同时要转换相关key
     if (Array.isArray(dataPage)) {
-      dataPage = { [props.tableConfig?.fetchMap?.list || 'records']: dataPage }
+      dataPage = { [defaultConf.table?.list || props.tableConfig?.fetchMap?.list || 'records']: dataPage }
     }
     try {
       let dataResult = [] as any
       if (props.isPager) {
-        pageInfo.total = dataPage[props.tableConfig?.fetchMap?.total || 'total'] * 1 || 0
-        pageInfo.current = dataPage[props.tableConfig?.fetchMap?.current || 'current'] || 1
-        dataResult = dataPage[props.tableConfig?.fetchMap?.list || 'records'] || null
+        pageInfo.total = dataPage[defaultConf.table?.page?.total || props.tableConfig?.fetchMap?.page?.total || 'total'] * 1 || 0
+        pageInfo.current = dataPage[defaultConf.table?.page?.current || props.tableConfig?.fetchMap?.page?.current || 'current'] || 1
+        dataResult = dataPage[defaultConf.table?.list || props.tableConfig?.fetchMap?.list || 'records'] || null
       } else {
-        dataResult = dataPage[props.tableConfig?.fetchMap?.list || 'records'] || null
+        dataResult = dataPage[defaultConf.table?.list || props.tableConfig?.fetchMap?.list || 'records'] || null
       }
 
       if (props.type !== 'expand' && props.isTempId && Array.isArray(dataResult)) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",
@@ -35,7 +35,6 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "element-plus": "2.5.1",
-    "lodash": "^4.17.21",
     "vue": "^3.2.47"
   },
   "devDependencies": {
@@ -50,6 +49,7 @@
     "eslint-plugin-vue": "^9.9.0",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.3",
+    "lodash": "^4.17.21",
     "prettier": "^3.0.0",
     "sass": "^1.58.3",
     "standard-version": "^9.5.0",

package/types/index.d.ts

@@ -34,13 +34,17 @@ export interface IFetch<T> {
 /**
  * 设定如何解析请求结果
  */
-export interface IFetchMap {
+export interface IFetchTableMap {
   // 结果列表key-默认records
   list?: string
-  // 总数key-默认total
-  total?: string
-  // 当前页key-默认current
-  current?: string
+  page?: {
+    // 总数key-默认total
+    total?: string
+    // 当前页key-默认current
+    current?: string
+    // 最大显示条数
+    pageSize?: string
+  }
 }
 
 /**
@@ -58,7 +62,7 @@ export type IDescItem = {
   label?: string | ((data?: any) => string)
   prop?: string | ((data?: any) => string)
   width?: string
-  format?: string | ((data?: any) => string)
+  format?: string | ((val?: any, row?: any) => string)
   vif?: boolean | ((data?: any) => boolean)
   vshow?: boolean | ((data?: any) => boolean)
   limit?: number
@@ -369,7 +373,7 @@ export interface ITableConfig {
   // 调用接口
   fetch?: IFetch<any>
   // 如何去解析数据结果
-  fetchMap?: IFetchMap
+  fetchMap?: IFetchTableMap
   // 列表配置，包含表头，每列信息等
   column?: Array<IColumnItem>
   // 查询条件
@@ -517,6 +521,7 @@ export interface ICRUDConfig {
     // 用户自定义form组件的名称,使用这个，全局注册的名字为el-plus-form-xxx，form中就可以使用xxx进行引入
     comList?: string[]
   }
+  table?: IFetchTableMap
   // 上传组件配置
   upload?: {
     // 类型 minio 或者 七牛 / 阿里云 或者不填，不填则完全依赖 action