dayjs 替代 moment

.eslintrc.js

@@ -89,7 +89,6 @@ module.exports = {
     'localStorage': true,
     'window': true,
     'BootstrapDialog': true,
-    'moment': true,
     'gantt': true,
     '__webpack_public_path__': true,
     'Notify': true,

package.json

@@ -18,8 +18,7 @@
     "click-outside-vue3": "^4.0.1",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.10.3",
-    "moment": "^2.29.4",
-    "pc-component-v3": "1.0.77",
+    "pc-component-v3": "1.0.81",
     "qrcode": "^1.5.3",
     "uuid": "^8.3.2",
     "v-tooltip": "^4.0.0-beta.17",

public/index-debug.html

@@ -49,9 +49,6 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/summernote/dist/summernote.min.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
 
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/moment/moment.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/moment/locale/zh-cn.js"></script>
-
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/reconnecting-websocket/reconnecting-websocket.js"></script>
 	
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/layui/dist/layui.js"></script>
@@ -71,9 +68,7 @@
 
 
 	
-	<script nonce="*NONCE_TOKEN*"  type="text/javascript">
-		moment.locale('zh');
-		
+	<script nonce="*NONCE_TOKEN*"  type="text/javascript">		
 		var nonce_token = "*NONCE_TOKEN*";
 	</script>
 </head>

public/index-release.html

@@ -47,8 +47,6 @@
 	<!-- <script src="../static/js/api.js"></script> -->
 
 	<script nonce="*NONCE_TOKEN*" src="../static/js/es6-promise.auto.min.js"></script>
-	<script nonce="*NONCE_TOKEN*" src="../static/js/moment.min.js"></script>
-	<script nonce="*NONCE_TOKEN*" src="../static/js/moment.zh-cn.js"></script>
 
 	<script nonce="*NONCE_TOKEN*" src="../static/js/browser.js"></script>
 	<script nonce="*NONCE_TOKEN*" src="../static/js/reconnecting-websocket.js"></script>
@@ -69,8 +67,6 @@
 	
 	
 	<script nonce="*NONCE_TOKEN*"  type="text/javascript">
-		moment.locale('zh');
-
 		var nonce_token = "*NONCE_TOKEN*";
 	</script>
 </head>

public/test/middleware.html

@@ -9,8 +9,7 @@
     <style type="text/css">
 
     </style>
-    <script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
-    <script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/locale/zh-cn.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/dayjs/dayjs.min.js"></script>
     <script type="text/javascript">
         // 方块的宽度、高度
         const rectHeight = 15;
@@ -33,8 +32,8 @@
             
 
             // 开始时间、结束时间的秒数
-            startTimeSec = Math.ceil(moment(startTime).valueOf() / 1000);
-            endTimeSec = Math.ceil(moment(endTime).valueOf() / 1000);
+            startTimeSec = Math.ceil(dayjs(startTime).valueOf() / 1000);
+            endTimeSec = Math.ceil(dayjs(endTime).valueOf() / 1000);
 
             // 结束时间-开始时间的间隔秒数
             let interval = endTimeSec - startTimeSec;
@@ -57,7 +56,7 @@
 
                 if(columnIndex === 0){
                     let currentSec = (startTimeSec + index) * 1000;
-                    let text = moment(currentSec).format('YYYY-MM-DD HH:mm:ss');
+                    let text = dayjs(currentSec).format('YYYY-MM-DD HH:mm:ss');
                     ctx.fillText(text, 0, rectTop + 10);
                 }
             }
@@ -73,7 +72,7 @@
 
             for(let index = 0; index < dataArray.length; index ++){
                 let data = dataArray[index];
-                let sec = Math.ceil(moment(data).valueOf() / 1000);
+                let sec = Math.ceil(dayjs(data).valueOf() / 1000);
 
                 let interval = sec - startTimeSec;
                 if(interval < 0){
@@ -101,8 +100,8 @@
             for(let index = 0; index < filterArray.length; index ++){
                 let data = filterArray[index];
 
-                let startSec = Math.ceil(moment(data.start).valueOf() / 1000);
-                let endSec = Math.ceil(moment(data.end).valueOf() / 1000);
+                let startSec = Math.ceil(dayjs(data.start).valueOf() / 1000);
+                let endSec = Math.ceil(dayjs(data.end).valueOf() / 1000);
 
                 let intervalStart = startSec - startTimeSec;
                 intervalStart = (intervalStart <= 0) ? 0 : intervalStart;

src/client/Login.vue

@@ -200,6 +200,7 @@ import { Notify, Uuid } from 'pc-component-v3';
 import { queryLoginAuth } from '.././identity/configData.js';
 import { message } from 'ant-design-vue';
 import { getImageSrc } from '../common/image-src';
+import dayjs from 'dayjs';
 
 export default {
   components: {},
@@ -525,7 +526,7 @@ export default {
      * 生成当前时间
      */
     generateCurrentDate: function () {
-      this.accountDateTime = moment().format('YYYY-MM-DD HH:mm:ss');
+      this.accountDateTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
       console.log('自动生成时间成功：' + this.accountDateTime);
     },
 

src/customer/BarCodeEditPanel.vue

@@ -75,6 +75,7 @@ import Common from '../common/Common.js';
 
 import { PrintUtil } from 'pc-component-v3';
 import { Notify, Uuid } from 'pc-component-v3';
+import dayjs from 'dayjs';
 
 export default {
 
@@ -181,7 +182,7 @@ export default {
         'content': JSON.stringify(_self.mPrintPage),
         'type': _self.selected.type,
         'sourceFileName': _self.selected.name,
-        'no': moment(new Date()).format('YYYY-MM-DD HH:mm'),
+        'no': dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
       };
 
       $.ajax({

src/customer/printTemp/step2.vue

@@ -235,6 +235,7 @@ import { message, Modal } from 'ant-design-vue';
 import Common from '../../common/Common.js';
 import { UploadOutlined } from '@ant-design/icons-vue';
 import { template } from '../../common/template';
+import dayjs from 'dayjs';
 
 const store = useStore();
 let cellTem = null;
@@ -318,7 +319,7 @@ const handleOk = () => {
     // contentType: 'application/json',
     dataType: 'json',
     data: {
-      no: moment(new Date()).format('YYYY-MM-DD HH:mm'),
+      no: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
       name: TempName.value,
       contentX6: JSON.stringify(json),
       type: 'X6',

src/sheetWindow/CurdWindowService.js

@@ -7,7 +7,7 @@ import EnumSelectFieldService from './EnumSelectFieldService.js';
 import Common from '../common/Common.js';
 import { Uuid } from 'pc-component-v3';
 import { Notify } from 'pc-component-v3';
-
+import dayjs from 'dayjs';
 /**
  * CURD 窗口服务类
  */
@@ -362,7 +362,7 @@ export default {
 
       case 'DateBoxEditor': {
         newFieldValue.fieldType = 'String';
-        var newValueFormat = moment(newValue).format('YYYY-MM-DD');
+        var newValueFormat = dayjs(newValue).format('YYYY-MM-DD');
         if (newValueFormat == 'Invalid date') {
           Notify.error('错误', '当前时间格式不正确，请重新输入。', 3000);
           newFieldValue.displayValue[0] = newValue;

src/window/filter/ComplexFilterPanel.vue

@@ -652,6 +652,8 @@ import CaseSensitive from './CaseSensitive.vue';
 
 import ClientOrganizationTree from '../../widget/ClientOrganizationTree.vue';
 import { Notify, Uuid } from 'pc-component-v3';
+import dayjs from 'dayjs';
+
 export default {
 
   components: {
@@ -954,10 +956,10 @@ export default {
             ) {
               let filterParam = {};
               filterParam.fieldName = filterSchemaLine.fieldName;
-              filterParam.value1 = moment(filterSchemaLine.value1).format('YYYY-MM');
+              filterParam.value1 = dayjs(filterSchemaLine.value1).format('YYYY-MM');
               if(filterSchemaLine.value2 != undefined &&
                 filterSchemaLine.value2 != ''){
-                filterParam.value2 = moment(filterSchemaLine.value2).format('YYYY-MM');
+                filterParam.value2 = dayjs(filterSchemaLine.value2).format('YYYY-MM');
               }
               filterParam.isCompositeOr = filterSchemaLine.isCompositeOr;
               filterParam.isCaseSensitive = filterSchemaLine.isCaseSensitive;

src/window/tabView/TabButton.vue

@@ -128,7 +128,7 @@ import ProcessReportResource from '../../api/dic/ProcessReportResource.js';
 import UserStorageResource from '../../api/base/UserStorageResource.js';
 import Language from '../../common/Language.js';
 import { Notify, Uuid } from 'pc-component-v3';
-
+import dayjs from 'dayjs';
 
 
 import NotificationPanel from '../../customer/NotificationPanel.vue';
@@ -606,7 +606,7 @@ export default {
       let formParameterValue = JSON.stringify(obj);
 
       var data = formParameterName + '=' + formParameterValue;
-      var timeStr = moment().format('_YYYYMMDD_hhmmss');
+      var timeStr = dayjs().format('_YYYYMMDD_hhmmss');
 
       var fileName =
         _self.showTabDto == null

webpack.base.js

@@ -81,7 +81,7 @@ module.exports = {
     'bootstrap': 'bootstrap',
     'BootstrapDialog': 'BootstrapDialog',
     'echarts': 'echarts',
-    'moment': 'moment',
+    'dayjs': 'dayjs',
     'vue': 'Vue',
     'vue-i18n': 'VueI18n',
     'vue-router': 'VueRouter',

webpack.lib.js

@@ -119,7 +119,6 @@ module.exports = WebpackMerge.merge(baseConfig,{
     "click-outside-vue3": "click-outside-vue3",
     "dayjs": "dayjs",
     "dingtalk-jsapi": "dingtalk-jsapi",
-    "moment": "moment",
     "pc-component-v3": "pc-component-v3",
     "v-tooltip": "v-tooltip",
     "vue-request": "vue-request",
@@ -132,7 +131,6 @@ module.exports = WebpackMerge.merge(baseConfig,{
     'bootstrap': 'bootstrap',
     'BootstrapDialog': 'BootstrapDialog',
     'echarts': 'echarts',
-    'moment': 'moment',
     'vue': 'vue',
     'vue-i18n': 'vue-i18n',
     'vue-router': 'vue-router',