修改页面弹窗全屏

2026-02-08 14:28:10 +08:00
parent 9820402b2c
commit d6e312de2b
45 changed files with 72 additions and 54 deletions
--- a/web-vue/packages/biz/views/biz/calendarSchedule/flow.vue
+++ b/web-vue/packages/biz/views/biz/calendarSchedule/flow.vue
@@ -10,6 +10,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="70%"
    class="calendar-flow-modal"
    destroyOnClose
--- a/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
+++ b/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:calendarSchedule:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/company/form.vue
+++ b/web-vue/packages/biz/views/biz/company/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:company:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/company/view.vue
+++ b/web-vue/packages/biz/views/biz/company/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartBarAccount.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartBarAccount.vue
@@ -375,9 +375,9 @@ const initChart = () => {
        itemGap: 20
      },
      grid: { 
-        left: '5%', 
-        right: '5%', 
-        bottom: '15%',
+        left: '2%', 
+        right: '2%', 
+        bottom: '1%',
        top: '20%',
        containLabel: true,
      },
@@ -386,7 +386,7 @@ const initChart = () => {
        data: accountNames,
        axisLabel: { 
          fontSize: 12, 
-          rotate: 15, // 银行名称旋转15度，避免重叠
+          rotate: 45, // 银行名称旋转15度，避免重叠
          interval: 0
        },
        axisTick: { inside: true },
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartBarCycle.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartBarCycle.vue
@@ -335,19 +335,18 @@ const initChart = () => {
        itemGap: 20
      },
      grid: { 
-        left: '5%', 
-        right: '5%', 
-        bottom: '15%',
+        left: '2%', 
+        right: '2%', 
+        bottom: '1%',
        top: '20%',
        containLabel: true,
-        padding: [10, 0, 0, 0]
      },
      xAxis: {
        type: 'category',
        data: dateList,
        axisLabel: { 
          fontSize: 12, 
-          rotate: 30,
+          rotate: 45,
          interval: 0
        },
        axisTick: { inside: true },
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineExp.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineExp.vue
@@ -233,9 +233,9 @@ const initChart = () => {
      textStyle: { fontSize: 12 }
    },
    grid: {
-      left: '8%',
-      right: '12%',
-      bottom: '10%',
+      left: '2%',
+      right: '2%',
+      bottom: '1%',
      top: '20%',
      containLabel: true
    },
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineInc.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineInc.vue
@@ -233,9 +233,9 @@ const initChart = () => {
      textStyle: { fontSize: 12 }
    },
    grid: {
-      left: '8%',
-      right: '12%',
-      bottom: '10%',
+      left: '2%',
+      right: '2%',
+      bottom: '1%',
      top: '20%',
      containLabel: true
    },
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineRatio.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineRatio.vue
@@ -167,9 +167,9 @@ const initChart = () => {
      tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
      legend: { data: ['收入', '支出', '支出占比'], top: 10, textStyle: { fontSize: 12 } },
      grid: {
-        left: '8%',
-        right: '12%',
-        bottom: '20%',
+        left: '2%',
+        right: '2%',
+        bottom: '1%',
        top: '20%',
        containLabel: true
      },
@@ -297,9 +297,9 @@ const initChart = () => {
      textStyle: { fontSize: 12 }
    },
    grid: {
-      left: '8%',
-      right: '12%',
-      bottom: '20%',
+      left: '2%',
+      right: '2%',
+      bottom: '1%',
      top: '20%',
      containLabel: true
    },
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineType.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartLineType.vue
@@ -303,9 +303,9 @@ const initChart = () => {
      tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
      legend: { data: [], top: 10, textStyle: { fontSize: 12 } },
      grid: {
-        left: '8%',
-        right: '12%',
-        bottom: '15%', // 增加底部间距适配日期标签
+        left: '2%',
+        right: '2%',
+        bottom: '1%', // 增加底部间距适配日期标签
        top: '20%',
        containLabel: true
      },
@@ -508,9 +508,9 @@ const initChart = () => {
      }
    },
    grid: {
-      left: '8%',
-      right: '12%',
-      bottom: '15%', // 增加底部间距适配日期标签
+      left: '2%',
+      right: '2%',
+      bottom: '1%', // 增加底部间距适配日期标签
      top: '20%',
      containLabel: true
    },
--- a/web-vue/packages/biz/views/biz/dataReport/erp/index.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/index.vue
@@ -16,17 +16,17 @@
        <ChartPie />
        <ChartLineRatio :formParams="FormValues" />
      </div>
+	  <div class="two-column-item">
+	    <ChartLineInc :formParams="FormValues" />
+	  		<ChartLineExp :formParams="FormValues" />
+	  </div>
+	  <div class="single-chart-item">
+	    <ChartLineType :formParams="FormValues" />
+	  </div>
      <div class="two-column-item">
        <ChartBarAccount :formParams="FormValues" />
 		<ChartBarCycle :formParams="FormValues" />
      </div>
-      <div class="two-column-item">
-        <ChartLineInc :formParams="FormValues" />
-		<ChartLineExp :formParams="FormValues" />
-      </div>
-    </div>
-    <div class="single-chart-item">
-      <ChartLineType :formParams="FormValues" />
    </div>
  </PageWrapper>
 </template>
--- a/web-vue/packages/biz/views/biz/dataReport/form.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:dataReport:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/dbConfig/form.vue
+++ b/web-vue/packages/biz/views/biz/dbConfig/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:dbConfig:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/dbConfig/view.vue
+++ b/web-vue/packages/biz/views/biz/dbConfig/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/execScript/form.vue
+++ b/web-vue/packages/biz/views/biz/execScript/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:execScript:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/execScript/view.vue
+++ b/web-vue/packages/biz/views/biz/execScript/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:monitorAccount:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/view.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:monitorHost:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/hostInfo/monitorHost/view.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/listItem/form.vue
+++ b/web-vue/packages/biz/views/biz/listItem/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:listItem:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/listItem/view.vue
+++ b/web-vue/packages/biz/views/biz/listItem/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/mailInfo/sent/form.vue
+++ b/web-vue/packages/biz/views/biz/mailInfo/sent/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:mailSent:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/meetingInfo/form.vue
+++ b/web-vue/packages/biz/views/biz/meetingInfo/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:meetingInfo:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/meetingInfo/view.vue
+++ b/web-vue/packages/biz/views/biz/meetingInfo/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/projectInfo/form.vue
+++ b/web-vue/packages/biz/views/biz/projectInfo/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:projectInfo:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/projectInfo/view.vue
+++ b/web-vue/packages/biz/views/biz/projectInfo/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/projectReport/form.vue
+++ b/web-vue/packages/biz/views/biz/projectReport/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:projectReport:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/projectReport/view.vue
+++ b/web-vue/packages/biz/views/biz/projectReport/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/projectRequirements/form.vue
+++ b/web-vue/packages/biz/views/biz/projectRequirements/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:projectRequirements:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/projectRequirements/view.vue
+++ b/web-vue/packages/biz/views/biz/projectRequirements/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/resumeEmployee/form.vue
+++ b/web-vue/packages/biz/views/biz/resumeEmployee/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:resumeEmployee:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/resumeEmployee/view.vue
+++ b/web-vue/packages/biz/views/biz/resumeEmployee/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/settingInfo/account/form.vue
+++ b/web-vue/packages/biz/views/biz/settingInfo/account/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:mailAccount:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/settingInfo/account/view.vue
+++ b/web-vue/packages/biz/views/biz/settingInfo/account/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/settingInfo/quickLogin/form.vue
+++ b/web-vue/packages/biz/views/biz/settingInfo/quickLogin/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:quickLogin:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/settingInfo/quickLogin/view.vue
+++ b/web-vue/packages/biz/views/biz/settingInfo/quickLogin/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/websiteStorage/form.vue
+++ b/web-vue/packages/biz/views/biz/websiteStorage/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'biz:websiteStorage:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/biz/views/biz/websiteStorage/view.vue
+++ b/web-vue/packages/biz/views/biz/websiteStorage/view.vue
@@ -9,6 +9,7 @@
    :showFooter="true"
    :showOkBtn="false"
    @register="registerModal"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/core/components/ListSelect/src/selectType/bizEmpSelect.ts
+++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizEmpSelect.ts
@@ -48,9 +48,10 @@ const searchForm: FormProps<BizResumeEmployee> = {
    {
      label: t('性别'),
      field: 'sex',
-      component: 'RadioGroup',
+      component: 'Select',
      componentProps: {
        dictType: 'sys_user_sex',
+		allowClear: true,
      },
    },
    {
--- a/web-vue/packages/core/components/ListSelect/src/selectType/userSelect.ts
+++ b/web-vue/packages/core/components/ListSelect/src/selectType/userSelect.ts
@@ -26,30 +26,12 @@ const searchForm: FormProps = {
      label: t('状态'),
      field: 'status',
      component: 'Select',
+	  defaultValue: '0',
      componentProps: {
        dictType: 'sys_user_status',
        allowClear: true,
      },
    },
-    {
-      field: 'none',
-      component: 'None',
-    },
-    {
-      label: t('手机'),
-      field: 'mobile',
-      component: 'Input',
-    },
-    {
-      label: t('邮箱'),
-      field: 'email',
-      component: 'Input',
-    },
-    {
-      label: t('电话'),
-      field: 'phone',
-      component: 'Input',
-    },
  ],
 };

--- a/web-vue/packages/erp/views/erp/account/form.vue
+++ b/web-vue/packages/erp/views/erp/account/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'erp:account:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/erp/views/erp/accountTransfer/form.vue
+++ b/web-vue/packages/erp/views/erp/accountTransfer/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'erp:accountTransfer:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="70%"
  >
    <template #title>
--- a/web-vue/packages/erp/views/erp/category/form.vue
+++ b/web-vue/packages/erp/views/erp/category/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'erp:category:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>
--- a/web-vue/packages/erp/views/erp/transactionFlow/form.vue
+++ b/web-vue/packages/erp/views/erp/transactionFlow/form.vue
@@ -10,6 +10,7 @@
    :okAuth="'erp:transactionFlow:edit'"
    @register="registerModal"
    @ok="handleSubmit"
+	defaultFullscreen="true"
    width="60%"
  >
    <template #title>