3.0.75 升级antd版本

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.74",
+  "version": "3.0.75",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -13,8 +13,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "ant-design-vue": "^3.2.15",
-    "pc-component-v3": "1.0.82",
+    "ant-design-vue": "^4.2.1",
+    "pc-component-v3": "1.0.83",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
   },

src/App.vue

@@ -1,13 +1,23 @@
 <template>
   <div id="app">
-    <router-view />
+    <a-config-provider :locale="locale">
+      <router-view />
+    </a-config-provider>
   </div>
 </template>
 
 <script>
+import zhCN from 'ant-design-vue/es/locale/zh_CN';
+import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
+dayjs.locale('zh-cn');
 export default {
   name: 'App',
-
+  data(){
+    return{
+      locale: zhCN,
+    };
+  },
   mounted: function () {
     var _self = this;
     var languageSelected = localStorage.getItem('#languageSelected');

src/common/CommonTable.vue

@@ -1,42 +1,42 @@
 <template>
   <div class="tablePaganations">
-    <a-config-provider :locale="locale">
-      <a-table
-        id="commonTable"
-        class="ant-table-striped"
-        bordered
-        size="small"
-        height="1000px"
-        :loading="isLoading"
-        :data-source="dataSource"
-        :columns="columns"
-        :row-key="(record) => record.id"
-        :scroll="{ y: yScroll }"
-        :pagination="havePage ? pagination : false"
-        :row-class-name="
-          (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-        "
-        :row-selection="
-          isSelect
-            ? {
-              selectedRowKeys: state.selectedRowKeys,
-              onSelect: selectEvent,
-              onSelectAll: selectAllEvent,
-            }
-            : null
-        "
-        @change="tableChange"
-        @resize-column="handleResizeColumn"
+    <!-- <a-config-provider :locale="locale"> -->
+    <a-table
+      id="commonTable"
+      class="ant-table-striped"
+      bordered
+      size="small"
+      height="1000px"
+      :loading="isLoading"
+      :data-source="dataSource"
+      :columns="columns"
+      :row-key="(record) => record.id"
+      :scroll="{ y: yScroll }"
+      :pagination="havePage ? pagination : false"
+      :row-class-name="
+        (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
+      "
+      :row-selection="
+        isSelect
+          ? {
+            selectedRowKeys: state.selectedRowKeys,
+            onSelect: selectEvent,
+            onSelectAll: selectAllEvent,
+          }
+          : null
+      "
+      @change="tableChange"
+      @resize-column="handleResizeColumn"
+    >
+      <template
+        v-for="(item, index) in renderArr"
+        #[item]="scope"
+        :key="index"
       >
-        <template
-          v-for="(item, index) in renderArr"
-          #[item]="scope"
-          :key="index"
-        >
-          <slot :name="item" :scope="scope" v-bind="scope || {}" />
-        </template>
-      </a-table>
-    </a-config-provider>
+        <slot :name="item" :scope="scope" v-bind="scope || {}" />
+      </template>
+    </a-table>
+    <!-- </a-config-provider> -->
   </div>
 </template>
   
@@ -52,8 +52,8 @@ import {
   onMounted,
 } from 'vue';
 import { getTableScroll } from '../common/tableScroll.js';
-import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
-const locale = ref(zhCN);
+// import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
+// const locale = ref(zhCN);
 
 const props = defineProps({
   // 表格数据

src/components/customer/AssetInventoryStep5.vue

@@ -46,7 +46,7 @@
           <a-button type="primary" style="height: 33.5px; margin-left: 30px" @click="showModal">上传</a-button>
         </a-form-item>
       </div>
-      <a-modal v-model:visible="visible" title="上传盘点资产数据" ok-text="确认" cancel-text="取消" @ok="handleOk">
+      <a-modal v-model:open="visible" title="上传盘点资产数据" ok-text="确认" cancel-text="取消" @ok="handleOk">
         <p>1、请点击【下载】按钮，下载所有的资产数据。</p>
         <a-button style="height: 33.5px" type="primary" @click="downloadFile">
           下载

src/components/customer/CommonTable.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 表格 + 分页 -->
   <div class="tablePaganations">
-    <a-config-provider :locale="locale">
+    <!-- <a-config-provider :locale="locale"> -->
       <a-table
         class="ant-table-striped"
         bordered
@@ -18,14 +18,14 @@
           <slot :name="item" :scope="scope" v-bind="scope || {}" />
         </template>
       </a-table>
-    </a-config-provider>
+    <!-- </a-config-provider> -->
   </div>
 </template>
   
 <script setup>
 import { useSlots, ref, reactive, defineProps, defineEmits, watch } from 'vue';
-import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
-const locale = ref(zhCN);
+// import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
+// const locale = ref(zhCN);
 const props = defineProps({
   dataSource: {
     type: Object,

src/components/customer/ManuallyConfirmCountingDataStep1.vue

@@ -47,7 +47,7 @@
     <a-button type="primary" class="previousBtn" @click="previousStep">
       上一步
     </a-button>
-    <a-modal v-model:visible="visible" width="800px" title="查看盘点单">
+    <a-modal v-model:open="visible" width="800px" title="查看盘点单">
       <template #footer>
         <a-button key="back" type="primary" @click="handleCancel">
           确认

src/components/sonicAlbumUpload/CommonTable.vue

@@ -1,40 +1,40 @@
 <template>
   <div class="tablePaganations">
-    <a-config-provider :locale="locale">
-      <a-table
-        class="ant-table-striped"
-        bordered
-        size="small"
-        height="1000px"
-        :loading="isLoading"
-        :data-source="dataSource"
-        :columns="columns"
-        :row-key="(record) => record.id"
-        :scroll="scrollValue"
-        :pagination="havePage ? pagination : false"
-        :row-selection="
-          isSelect
-            ? {
-              selectedRowKeys: state.selectedRowKeys,
-              onSelect: selectEvent,
-              onSelectAll: selectAllEvent,
-            }
-            : null
-        "
-        :row-class-name="
-          (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-        "
-        @resize-column="handleResizeColumn"
+    <!-- <a-config-provider :locale="locale"> -->
+    <a-table
+      class="ant-table-striped"
+      bordered
+      size="small"
+      height="1000px"
+      :loading="isLoading"
+      :data-source="dataSource"
+      :columns="columns"
+      :row-key="(record) => record.id"
+      :scroll="scrollValue"
+      :pagination="havePage ? pagination : false"
+      :row-selection="
+        isSelect
+          ? {
+            selectedRowKeys: state.selectedRowKeys,
+            onSelect: selectEvent,
+            onSelectAll: selectAllEvent,
+          }
+          : null
+      "
+      :row-class-name="
+        (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
+      "
+      @resize-column="handleResizeColumn"
+    >
+      <template
+        v-for="(item, index) in renderArr"
+        #[item]="scope"
+        :key="index"
       >
-        <template
-          v-for="(item, index) in renderArr"
-          #[item]="scope"
-          :key="index"
-        >
-          <slot :name="item" :scope="scope" v-bind="scope || {}" />
-        </template>
-      </a-table>
-    </a-config-provider>
+        <slot :name="item" :scope="scope" v-bind="scope || {}" />
+      </template>
+    </a-table>
+    <!-- </a-config-provider> -->
   </div>
 </template>
   
@@ -49,8 +49,8 @@ import {
   onMounted,
   defineExpose,
 } from 'vue';
-import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
-const locale = ref(zhCN);
+// import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
+// const locale = ref(zhCN);
 const props = defineProps({
   dataSource: {
     type: Object,

src/components/sonicAlbumUpload/index.vue

@@ -115,7 +115,7 @@
       </CommonTable>
     </div>
   </div>
-  <a-modal v-model:visible="downloadVisible" title="请选择下载数据范围">
+  <a-modal v-model:open="downloadVisible" title="请选择下载数据范围">
     <p>
       全部数据：下载当前选择公司的全部资产图片数据。<a @click="downloadReport(0)">下载</a>
     </p>
@@ -129,7 +129,7 @@
       <a-button @click="downloadVisible = false">取消</a-button>
     </template>
   </a-modal>
-  <a-modal v-model:visible="imagesVisible" width="800px" title="已上传图片数据">
+  <a-modal v-model:open="imagesVisible" width="800px" title="已上传图片数据">
     <div class="operation">
       <a-button danger :disabled="deleteParams.length > 0 ? false : true" @click="deleteImageData">
         删除
@@ -157,7 +157,7 @@
       <a-button @click="imagesVisible = false">取消</a-button>
     </template>
   </a-modal>
-  <a-modal v-model:visible="showLargeImage">
+  <a-modal v-model:open="showLargeImage">
     <a-image :preview="false" :src="getImageSrc(className, imageName)" />
     <template #footer>
       <a-button @click="showLargeImage = false">取消</a-button>

src/main.js

@@ -12,7 +12,7 @@ import Antd from 'ant-design-vue';
 
 import App from './App.vue';
 import routes from './router/index.js';
-import 'ant-design-vue/dist/antd.css';
+// import 'ant-design-vue/dist/antd.css';
 
 
 import 'jquery';