From 5fa3fdbc7808132eee453b89a02891fb82148a57 Mon Sep 17 00:00:00 2001
From: "gary.fu" <xuebaiyouling@gmail.com>
Date: Thu, 25 Jan 2024 17:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/main.css                           |  4 ++
 src/components/common-autocomplete/index.vue  | 45 +++++++++++++----
 .../common-autocomplete/public.d.ts           |  8 ++-
 src/components/common-breadcrumb/index.vue    |  5 +-
 src/components/common-form-control/index.vue  | 49 +++++++++++++++++--
 src/components/common-form/index.vue          |  7 ++-
 src/components/common-menu-item/index.vue     |  6 +--
 .../common-table/common-table-column.vue      | 23 ++++++++-
 src/components/common-table/index.vue         |  6 +--
 src/components/index.js                       |  4 ++
 src/components/utils/index.js                 | 13 +++++
 src/layout/TopNav.vue                         |  2 +-
 src/services/city/CityService.js              |  4 +-
 src/stores/MenuConfigStore.js                 |  2 +-
 src/views/HomeView.vue                        |  1 -
 src/views/admin/Menus.vue                     |  2 +-
 src/views/tools/Tables.vue                    |  2 +-
 17 files changed, 147 insertions(+), 36 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index d4a99f3..8c4a478 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -90,6 +90,10 @@ html, body, #app, .index-container {
     display: block;
 }
 
+.flex-column {
+    flex-direction: column;
+}
+
 .container-center {
     display: flex;
     justify-content: center;
diff --git a/src/components/common-autocomplete/index.vue b/src/components/common-autocomplete/index.vue
index 7dfd6df..11da421 100644
--- a/src/components/common-autocomplete/index.vue
+++ b/src/components/common-autocomplete/index.vue
@@ -21,6 +21,10 @@ const props = defineProps({
     type: String,
     default: ''
   },
+  autoPageShowTitle: {
+    type: Boolean,
+    default: false
+  },
   placeholder: {
     type: String,
     default: ''
@@ -29,11 +33,11 @@ const props = defineProps({
     type: String,
     default: ''
   },
-  idKey: {
+  idProp: {
     type: String,
     default: 'value'
   },
-  labelKey: {
+  labelProp: {
     type: String,
     default: 'label'
   },
@@ -47,7 +51,7 @@ const props = defineProps({
   },
   inputWidth: {
     type: String,
-    default: '220px'
+    default: '200px'
   },
   autocompleteConfig: {
     type: Object,
@@ -61,6 +65,14 @@ const props = defineProps({
     type: Number,
     default: 4
   },
+  rowSize: {
+    type: Number,
+    default: 6
+  },
+  tabStretch: {
+    type: Boolean,
+    default: true
+  },
   clearable: {
     type: Boolean,
     default: true
@@ -122,8 +134,8 @@ const autoPage = ref({
 })
 const loadingData = ref(false)
 
-const idProp = computed(() => props.autocompleteConfig?.idKey || props.idKey)
-const labelProp = computed(() => props.autocompleteConfig?.labelKey || props.labelKey)
+const idProp = computed(() => props.autocompleteConfig?.idProp || props.idProp)
+const labelProp = computed(() => props.autocompleteConfig?.labelProp || props.labelProp)
 
 const showSelectPage = computed(() => {
   return props.selectPageConfig && (!keywords.value || lastAutocompleteLabel.value === keywords.value)
@@ -303,8 +315,8 @@ const parsedSelectPageData = computed(() => {
 })
 
 const getSelectPage = (totalCount) => {
-  const pageSize = 5
-  const pageCount = Math.ceil((totalCount + pageSize - 1) / pageSize)
+  const pageSize = props.rowSize
+  const pageCount = Math.floor((totalCount + pageSize - 1) / pageSize)
   return {
     pageNumber: 1,
     pageSize,
@@ -321,10 +333,22 @@ const selectPagePagination = (tab) => {
 const selectPagePaginationChange = (tab, pageNumber) => {
   const pager = selectPagePageConfig.value?.[tab.id]
   pager.pageNumber = pageNumber
-  console.info('==================selectPagePaginationChange', tab, pageNumber, pager)
   selectPageData.value = { ...selectPageData.value }
 }
 
+const autoTitle = computed(() => {
+  if (!showSelectPage.value && !props.autoPageShowTitle) {
+    return undefined
+  }
+  return props.title || props.placeholder
+})
+
+watch(() => props.selectPageConfig, () => {
+  selectPagePageConfig.value = {}
+  selectPageData.value = {}
+  selectPageTab.value = null
+})
+
 </script>
 
 <template>
@@ -334,7 +358,7 @@ const selectPagePaginationChange = (tab, pageNumber) => {
     popper-class="common-autocomplete"
     placement="bottom-start"
     :width="autocompleteWidth"
-    :title="title||placeholder"
+    :title="autoTitle"
   >
     <template #reference>
       <el-input
@@ -355,6 +379,7 @@ const selectPagePaginationChange = (tab, pageNumber) => {
           v-model="selectPageTab"
           class="common-select-page"
           type="border-card"
+          :stretch="tabStretch"
           @tab-click="onInputKeywords(false)"
         >
           <el-tab-pane
@@ -363,7 +388,7 @@ const selectPagePaginationChange = (tab, pageNumber) => {
             :name="tab.id"
           >
             <template #label>
-              <span>{{ tab.label }}</span>
+              <span>{{ tab.label || (tab.labelKey && $t(tab.labelKey)) || tab.id }}</span>
             </template>
             <template #default>
               <div
diff --git a/src/components/common-autocomplete/public.d.ts b/src/components/common-autocomplete/public.d.ts
index df756f5..e1fa574 100644
--- a/src/components/common-autocomplete/public.d.ts
+++ b/src/components/common-autocomplete/public.d.ts
@@ -50,14 +50,16 @@ export interface CommonAutocompleteProps {
     disabled?: boolean;
     // 没有输入时是否可以搜索
     emptySearchEnabled?: boolean;
+    // 是否在自动完成时显示标题
+    autoPageShowTitle?: boolean;
     // 自动完成标题
     title?: string;
     // 占位符
     placeholder?: string;
     // id字段名
-    idKey?: string;
+    idProp?: string;
     // label字段名
-    labelKey?: string;
+    labelProp?: string;
     // 防抖延时
     debounceTime?: number;
     // 自动完成宽度
@@ -68,6 +70,8 @@ export interface CommonAutocompleteProps {
     selectPageConfig?: CommonSelectPageOption;
     // 可选项列默认显示几列
     colSize?: number;
+    // 可选项列默认显示几行
+    rowSize?: number;
     // 加载提示loading
     loadingText?: string;
     // 最低高度
diff --git a/src/components/common-breadcrumb/index.vue b/src/components/common-breadcrumb/index.vue
index fe96ba5..523552f 100644
--- a/src/components/common-breadcrumb/index.vue
+++ b/src/components/common-breadcrumb/index.vue
@@ -10,7 +10,8 @@ const route = useRoute()
 
 const breadcrumbs = computed(() => {
   const exists = []
-  return route.matched.map(item => {
+  return route.matched.map((item, index) => {
+    item = index === route.matched.length - 1 ? route : item
     const menuInfo = useMenuInfo(item)
     let icon = ''
     if (menuInfo && menuInfo.icon) {
@@ -28,7 +29,7 @@ const breadcrumbs = computed(() => {
     if (notExist) {
       exists.push(item.menuName)
     }
-    return notExist
+    return notExist && !item.menuName.endsWith('Base')
   })
 })
 </script>
diff --git a/src/components/common-form-control/index.vue b/src/components/common-form-control/index.vue
index 79142ea..b744d6a 100644
--- a/src/components/common-form-control/index.vue
+++ b/src/components/common-form-control/index.vue
@@ -20,16 +20,24 @@ const props = defineProps({
   model: {
     type: Object,
     required: true
+  },
+  labelWidth: {
+    type: String,
+    default: null
   }
 })
 
 const inputType = computed(() => useInputType(props.option))
 
 const modelAttrs = computed(() => {
-  const attrs = { ...props.option.attrs }
-  if (attrs.clearable === undefined && ['el-input', 'el-select', 'common-autocomplete', 'el-autocomplete', 'el-cascader', 'el-tree-select'].includes(inputType.value)) {
+  const option = props.option
+  const attrs = { ...option.attrs }
+  if (attrs.clearable === undefined && ['el-input', 'el-select', 'el-select-v2', 'common-autocomplete', 'el-autocomplete', 'el-cascader', 'el-tree-select'].includes(inputType.value)) {
     attrs.clearable = true
   }
+  if (inputType.value === 'common-autocomplete' && option.getAutocompleteLabel) {
+    attrs.defaultLabel = option.getAutocompleteLabel(props.model, option)
+  }
   return attrs
 })
 
@@ -41,6 +49,10 @@ const label = computed(() => {
   return option.label
 })
 
+const showLabel = computed(() => {
+  return props.option.showLabel !== false && props.labelWidth !== '0'
+})
+
 const formModel = computed(() => props.option.model || props.model)
 
 const modelValue = computed({
@@ -105,7 +117,7 @@ const initFormModel = () => {
     const option = props.option
     if (option.prop) {
       const defaultVal = get(formModel.value, option.prop)
-      set(formModel.value, option.prop, defaultVal || option.value || undefined)
+      set(formModel.value, option.prop, defaultVal ?? option.value ?? undefined)
     }
   }
 }
@@ -114,15 +126,36 @@ initFormModel()
 
 watch(() => props.option, initFormModel, { deep: true })
 
+const hasModelText = computed(() => {
+  return !!(modelAttrs.value.modelText || modelAttrs.value.modelTextFunc)
+})
+
+const emit = defineEmits(['change'])
+
+const controlChange = (...args) => {
+  const option = props.option
+  if (option.change) {
+    option.change(...args)
+  }
+  emit('change', ...args)
+}
+
+const formItemEnabled = computed(() => props.option.enabled !== false)
+
 </script>
 
 <template>
   <el-form-item
+    v-if="formItemEnabled"
     ref="formItemRef"
     :rules="rules"
     :prop="option.prop"
+    :label-width="labelWidth"
   >
-    <template #label>
+    <template
+      v-if="showLabel"
+      #label
+    >
       <span>{{ label }}</span>
       <el-tooltip
         v-if="option.tooltip||option.tooltipFunc"
@@ -151,8 +184,14 @@ watch(() => props.option, initFormModel, { deep: true })
       :placeholder="option.placeholder"
       :disabled="option.disabled"
       :readonly="option.readonly"
-      @change="option.change"
+      @change="controlChange"
     >
+      <template
+        v-if="hasModelText"
+        #default
+      >
+        {{ modelAttrs.modelText || modelAttrs.modelTextFunc(modelValue) }}
+      </template>
       <template v-if="children&&children.length">
         <control-child
           v-for="(childItem, index) in children"
diff --git a/src/components/common-form/index.vue b/src/components/common-form/index.vue
index c3dfe06..63d6c37 100644
--- a/src/components/common-form/index.vue
+++ b/src/components/common-form/index.vue
@@ -11,11 +11,13 @@ const props = defineProps({
    */
   options: {
     type: Array,
-    required: true
+    default () {
+      return []
+    }
   },
   labelWidth: {
     type: String,
-    default: '100px'
+    default: '110px'
   },
   model: {
     type: Object,
@@ -94,6 +96,7 @@ defineExpose({
         :model="formModel"
       />
       <common-form-control
+        v-if="option.enabled!==false"
         :model="formModel"
         :option="option"
       />
diff --git a/src/components/common-menu-item/index.vue b/src/components/common-menu-item/index.vue
index 289b8ba..df332a6 100644
--- a/src/components/common-menu-item/index.vue
+++ b/src/components/common-menu-item/index.vue
@@ -35,7 +35,7 @@ const menuCls = computed(() => {
 })
 const dropdownClick = (menuItem, $event) => {
   if (menuItem.click) {
-    menuItem.click(router, $event)
+    menuItem.click($event)
   } else {
     const route = menuItem.route || menuItem.index
     if (route) {
@@ -85,7 +85,7 @@ const dropdownClick = (menuItem, $event) => {
     v-else-if="isDropdown"
     :key="menuItem.index||index"
     :class="menuCls"
-    @click="menuItem.click&&menuItem.click(router, $event)"
+    @click="menuItem.click&&menuItem.click($event)"
   >
     <el-dropdown class="common-dropdown">
       <span class="el-dropdown-link">
@@ -120,7 +120,7 @@ const dropdownClick = (menuItem, $event) => {
     :route="menuItem.route"
     v-bind="menuItem.attrs"
     :index="menuItem.index"
-    @click="menuItem.click&&menuItem.click(router, $event)"
+    @click="menuItem.click&&menuItem.click(menuItem, $event)"
   >
     <common-icon
       :size="menuItem.iconSize"
diff --git a/src/components/common-table/common-table-column.vue b/src/components/common-table/common-table-column.vue
index 19414aa..5a82ae0 100644
--- a/src/components/common-table/common-table-column.vue
+++ b/src/components/common-table/common-table-column.vue
@@ -1,4 +1,8 @@
 <script setup>
+import { formatDate } from '@/components/utils'
+import { computed } from 'vue'
+import { get } from 'lodash'
+
 /**
  * 配置信息
  * @type {CommonTableColumnProps}
@@ -20,6 +24,21 @@ const props = defineProps({
   }
 })
 
+const formatter = computed(() => {
+  const column = props.column
+  if (!column.formatter && column.dateFormat) { // 没有formatter但是有dateFormat
+    return row => {
+      const data = getPropertyData(row)
+      return formatDate(data, column.dateFormat)
+    }
+  }
+  return column.formatter
+})
+
+const getPropertyData = (row) => {
+  return get(row, props.column.property)
+}
+
 </script>
 
 <template>
@@ -29,7 +48,7 @@ const props = defineProps({
     :prop="column.prop||column.property"
     :width="column.width"
     v-bind="column.attrs"
-    :formatter="column.formatter"
+    :formatter="formatter"
   >
     <template
       v-if="column.slot||column.click"
@@ -41,7 +60,7 @@ const props = defineProps({
         v-bind="column.linkAttrs"
         @click="column.click(scope.row, scope)"
       >
-        {{ column.formatter?column.formatter(scope.row, scope):scope.row[column.property] }}
+        {{ formatter?formatter(scope.row, scope):getPropertyData(scope.row) }}
       </el-link>
       <slot
         v-bind="scope"
diff --git a/src/components/common-table/index.vue b/src/components/common-table/index.vue
index b223f59..4724eaf 100644
--- a/src/components/common-table/index.vue
+++ b/src/components/common-table/index.vue
@@ -102,7 +102,7 @@ const calcColumns = computed(() => {
     }
     _columns = [..._columns, buttonColumn]
   }
-  return _columns
+  return _columns.filter(column => column.enabled !== false)
 })
 
 const emit = defineEmits(['pageSizeChange', 'currentPageChange', 'update:page'])
@@ -127,7 +127,7 @@ defineExpose({
 <template>
   <el-container
     v-loading="loading"
-    class="no_flex"
+    class="flex-column"
     :element-loading-text="loadingText"
   >
     <el-table
@@ -160,7 +160,7 @@ defineExpose({
       </common-table-column>
     </el-table>
     <el-pagination
-      v-if="page&&page.pageCount&&page.pageCount>1"
+      v-if="page&&page.pageCount"
       class="common-pagination"
       v-bind="pageAttrs"
       :total="page.totalCount"
diff --git a/src/components/index.js b/src/components/index.js
index e109e41..5ae16f9 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,10 +2,12 @@ import CommonIcon from '@/components/common-icon/index.vue'
 import CommonIconSelect from '@/components/common-icon-select/index.vue'
 import CommonForm from '@/components/common-form/index.vue'
 import CommonFormControl from '@/components/common-form-control/index.vue'
+import CommonFormLabel from '@/components/common-form-control/common-form-label.vue'
 import CommonMenu from '@/components/common-menu/index.vue'
 import CommonMenuItem from '@/components/common-menu-item/index.vue'
 import CommonTabsView from '@/components/common-tabs-view/index.vue'
 import CommonTable from '@/components/common-table/index.vue'
+import CommonTableForm from '@/components/common-table-form/index.vue'
 import CommonBreadcrumb from '@/components/common-breadcrumb/index.vue'
 import CommonWindow from '@/components/common-window/index.vue'
 import CommonAutocomplete from '@/components/common-autocomplete/index.vue'
@@ -22,10 +24,12 @@ export default {
     Vue.component('CommonIconSelect', CommonIconSelect)
     Vue.component('CommonForm', CommonForm)
     Vue.component('CommonFormControl', CommonFormControl)
+    Vue.component('CommonFormLabel', CommonFormLabel)
     Vue.component('CommonMenu', CommonMenu)
     Vue.component('CommonMenuItem', CommonMenuItem)
     Vue.component('CommonTabsView', CommonTabsView)
     Vue.component('CommonTable', CommonTable)
+    Vue.component('CommonTableForm', CommonTableForm)
     Vue.component('CommonBreadcrumb', CommonBreadcrumb)
     Vue.component('CommonWindow', CommonWindow)
     Vue.component('CommonAutocomplete', CommonAutocomplete)
diff --git a/src/components/utils/index.js b/src/components/utils/index.js
index 6c767b5..0cff6b5 100644
--- a/src/components/utils/index.js
+++ b/src/components/utils/index.js
@@ -1,5 +1,6 @@
 import { ref } from 'vue'
 import { $i18nBundle } from '@/messages'
+import dayjs from 'dayjs'
 
 const calcWithIf = menuItem => {
   ['icon', 'labelKey', 'label', 'html'].forEach(key => {
@@ -73,3 +74,15 @@ export const useParentRoute = function (route) {
   }
   return route
 }
+
+export const formatDate = (date, format) => {
+  if (date) {
+    return dayjs(date).format(format || 'YYYY-MM-DD HH:mm:ss')
+  }
+}
+
+export const formatDay = (date, format) => {
+  if (date) {
+    return dayjs(date).format(format || 'YYYY-MM-DD')
+  }
+}
diff --git a/src/layout/TopNav.vue b/src/layout/TopNav.vue
index 526696c..6301660 100644
--- a/src/layout/TopNav.vue
+++ b/src/layout/TopNav.vue
@@ -7,7 +7,7 @@ const globalConfigStore = useGlobalConfigStore()
 const menuConfigStore = useMenuConfigStore()
 
 const allMenus = computed(() => {
-  const topMenus = menuConfigStore.loadBaseTopMenus()
+  const topMenus = menuConfigStore.loadBaseTopMenus().value
   const businessMenus = menuConfigStore.calcBusinessMenus()
   if (globalConfigStore.layoutMode === GlobalLayoutMode.TOP) {
     return [...businessMenus, ...topMenus.slice(1)]
diff --git a/src/services/city/CityService.js b/src/services/city/CityService.js
index 954364b..2a43c2f 100644
--- a/src/services/city/CityService.js
+++ b/src/services/city/CityService.js
@@ -27,8 +27,8 @@ export const loadAutoCities = (data, config) => {
  */
 export const useCityAutocompleteConfig = () => {
   return {
-    idKey: 'code',
-    labelKey: $i18nMsg('nameCn', 'nameEn'),
+    idProp: 'code',
+    labelProp: $i18nMsg('nameCn', 'nameEn'),
     columns: [{
       label: $i18nMsg('代码', 'Code'),
       property: 'code'
diff --git a/src/stores/MenuConfigStore.js b/src/stores/MenuConfigStore.js
index e380490..f08fa32 100644
--- a/src/stores/MenuConfigStore.js
+++ b/src/stores/MenuConfigStore.js
@@ -10,7 +10,7 @@ export const useMenuConfigStore = defineStore('menuConfig', () => {
   return {
     businessMenus,
     loadBaseTopMenus () {
-      return useBaseTopMenus()
+      return ref(useBaseTopMenus())
     },
     async loadBusinessMenus () {
       businessMenus.value = await loadAndParseMenus()
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 27a388e..39bdf28 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -13,7 +13,6 @@ const tabsViewStore = useTabsViewStore()
 const showLeftMenu = computed(() => {
   return globalConfigStore.layoutMode === GlobalLayoutMode.LEFT
 })
-menuConfigStore.loadBaseTopMenus()
 menuConfigStore.loadBusinessMenus()
 </script>
 
diff --git a/src/views/admin/Menus.vue b/src/views/admin/Menus.vue
index a01e472..c0000d1 100644
--- a/src/views/admin/Menus.vue
+++ b/src/views/admin/Menus.vue
@@ -82,7 +82,7 @@ const doSearch = form => {
 
 <template>
   <el-container
-    class="no_flex"
+    class="flex-column"
   >
     <common-form
       inline
diff --git a/src/views/tools/Tables.vue b/src/views/tools/Tables.vue
index 1725011..5b6f3fe 100644
--- a/src/views/tools/Tables.vue
+++ b/src/views/tools/Tables.vue
@@ -130,7 +130,7 @@ const submitForm = () => {
 
 <template>
   <el-container
-    class="no_flex"
+    class="flex-column"
   >
     <common-form
       inline