Bladeren bron

feat(代码生成器-代码管理): 代码管理页面功能完善

shizhongming 2 jaren geleden
bovenliggende
commit
a0837e319e

+ 6 - 7
src/modules/codeGenerator/views/codeDesign/CodeDesignPage.vue

@@ -2,7 +2,7 @@
   <div class="full-height page-container">
     <div class="spin">
       <div class="form-container">
-        <a-spin :spinning="pageLoading">
+        <Spin :spinning="pageLoading">
           <BasicForm @register="registerForm" :size="getFormSize">
             <template #addEditForm-connectionId="{ model }">
               <DatabaseSelect
@@ -37,7 +37,7 @@
               </a-button>
             </template>
           </BasicForm>
-          <a-divider />
+          <Divider />
           <a-tabs style="min-height: 400px" animated>
             <a-tab-pane key="1" :tab="$t('generator.views.code.title.dbMessage')">
               <TableFieldTable
@@ -71,9 +71,9 @@
               />
             </a-tab-pane>
           </a-tabs>
-        </a-spin>
+        </Spin>
       </div>
-      <a-divider />
+      <Divider />
       <div style="text-align: right">
         <a-button @click="loadConfigData">
           {{ $t('common.button.reload') }}
@@ -105,6 +105,7 @@
   import { toNumber } from 'lodash-es';
   import { propTypes } from '@/utils/propTypes';
   import { useModal } from '@/components/Modal';
+  import { Divider, Spin } from 'ant-design-vue';
 
   import { useLoadDbData, useSaveConfig } from './CodeDesignPageHook';
 
@@ -113,7 +114,7 @@
   import PageTableSetting from './componenets/PageTableSetting/PageTableSetting.vue';
   import PageFormSetting from './componenets/PageFromSetting/PageFormSetting.vue';
   import PageSearchSetting from './componenets/PageSearchSetting/PageSearchSetting.vue';
-  import Icon from '@/components/Icon/src/Icon.vue';
+  import { Icon } from '@/components/Icon';
   import PageAddendumTableChoseModal from './componenets/PageAddendumTableChoseModal.vue';
 
   const props = defineProps({
@@ -230,8 +231,6 @@
 
 <style scoped lang="less">
   .page-container {
-    padding: 10px;
-
     :deep(.ant-divider) {
       margin: 5px 0;
     }

+ 1 - 1
src/modules/codeGenerator/views/codeDesign/componenets/PageFromSetting/PageFormSetting.vue

@@ -131,7 +131,7 @@
     vueTableHeaderCheckboxSupport,
     vueChoseSelectTableSupport,
   } from '../PageSettingSupport';
-  import Icon from '@/components/Icon/src/Icon.vue';
+  import { Icon } from '@/components/Icon';
 
   const copyField = [
     'columnName',

+ 17 - 6
src/modules/codeGenerator/views/codeList/CodeListView.config.tsx

@@ -24,12 +24,7 @@ export const tableColumns = (t: Function): SmartColumn[] => {
       type: 'checkbox',
       width: 60,
       fixed: 'left',
-    },
-    {
-      title: '{generator.views.code.table.connectionName}',
-      field: 'connectionName',
-      width: 160,
-      fixed: 'left',
+      field: 'checkbox',
     },
     {
       title: '{generator.views.code.table.configName}',
@@ -43,6 +38,11 @@ export const tableColumns = (t: Function): SmartColumn[] => {
       width: 160,
       fixed: 'left',
     },
+    {
+      title: '{generator.views.code.table.connectionName}',
+      field: 'connectionName',
+      width: 160,
+    },
     {
       title: '{generator.views.code.table.type}',
       field: 'type',
@@ -107,10 +107,20 @@ export const tableColumns = (t: Function): SmartColumn[] => {
 
 export const searchFormColumns = (t: Function): SmartSearchFormSchema[] => {
   return [
+    {
+      field: 'configName',
+      label: '',
+      component: 'Input',
+      searchSymbol: 'like',
+      componentProps: {
+        placeholder: t('generator.views.code.table.configName'),
+      },
+    },
     {
       field: 'tableName',
       label: '',
       component: 'Input',
+      searchSymbol: 'like',
       componentProps: {
         placeholder: t('generator.views.code.table.tableName'),
       },
@@ -119,6 +129,7 @@ export const searchFormColumns = (t: Function): SmartSearchFormSchema[] => {
       field: 'type',
       label: '',
       component: 'Select',
+      searchSymbol: '=',
       componentProps: {
         style: {
           width: '100px',

+ 6 - 0
src/modules/codeGenerator/views/codeList/CodeListView.vue

@@ -81,6 +81,9 @@
   const [registerCodeCreateModal, { openModal: openCodeCreateModal }] = useModal();
 
   const [registerTable, { reload }] = useSmartTable({
+    id: 'smart-tool-code-coldeList',
+    customConfig: { storage: true },
+    border: true,
     searchFormConfig: {
       searchWithSymbol: true,
       layout: 'inline',
@@ -92,6 +95,7 @@
         width: '100%',
       },
       labelAlign: 'left',
+      compact: true,
     },
     height: 'auto',
     columns: tableColumns(t),
@@ -118,6 +122,8 @@
     },
     toolbarConfig: {
       refresh: true,
+      zoom: true,
+      column: { columnOrder: true },
       buttons: [
         {
           code: 'ModalAdd',