fix: mock plugin error #171

Author: anncwb

.editorconfig

@@ -13,3 +13,6 @@ indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.env.production

@@ -2,13 +2,13 @@
 VITE_USE_MOCK = true
 
 # public path
-VITE_PUBLIC_PATH = ./
+VITE_PUBLIC_PATH = /
 
 # Delete console
 VITE_DROP_CONSOLE = true
 
 # Whether to output gz file for packaging
-VITE_BUILD_GZIP = true
+VITE_BUILD_GZIP = false
 
 # Basic interface address SPA
 VITE_GLOB_API_URL=/api

build/script/hackXlsx.ts

@@ -2,10 +2,10 @@ import type { GetManualChunk, GetManualChunkApi } from 'rollup';
 
 //
 const vendorLibs: { match: string[]; output: string }[] = [
-  {
-    match: ['xlsx'],
-    output: 'xlsx',
-  },
+  // {
+  //   match: ['xlsx'],
+  //   output: 'xlsx',
+  // },
 ];
 
 // @ts-ignore

build/vite/optimizer.ts

@@ -2,7 +2,7 @@ import gzipPlugin from 'rollup-plugin-gzip';
 import { isBuildGzip } from '../../utils';
 import { Plugin } from 'vite';
 export function configGzipPlugin(isBuild: boolean): Plugin | Plugin[] {
-  const useGzip = isBuild && isBuildGzip;
+  const useGzip = isBuild && isBuildGzip();
 
   if (useGzip) {
     return gzipPlugin();

build/vite/plugin/gzip.ts

@@ -1,6 +1,6 @@
 {
   "name": "vben-admin",
-  "version": "2.0.0-rc.16",
+  "version": "2.0.0-rc.15",
   "scripts": {
     "bootstrap": "yarn install",
     "serve": "vite",
@@ -15,9 +15,7 @@
     "lint:eslint": "eslint --fix --ext \"src/**/*.{vue,less,css,scss}\"",
     "lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
     "lint:stylelint": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
-    "reinstall": "rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap",
-    "hack-esm:xlsx": "esno ./build/script/hackXlsx",
-    "postinstall": "npm run hack-esm:xlsx"
+    "reinstall": "rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap"
   },
   "dependencies": {
     "@iconify/iconify": "^2.0.0-rc.5",
@@ -98,11 +96,11 @@
     "stylelint-order": "^4.1.0",
     "ts-node": "^9.1.0",
     "typescript": "^4.1.3",
-    "vite": "^2.0.0-beta.19",
+    "vite": "^2.0.0-beta.21",
     "vite-plugin-html": "^2.0.0-beta.5",
-    "vite-plugin-mock": "^2.0.0-beta.1",
+    "vite-plugin-mock": "^2.0.0-beta.3",
     "vite-plugin-purge-icons": "^0.5.0",
-    "vite-plugin-pwa": "^0.3.3",
+    "vite-plugin-pwa": "^0.3.5",
     "vue-eslint-parser": "^7.3.0",
     "yargs": "^16.2.0"
   },

package.json

@@ -41,7 +41,8 @@
   import FormAction from './components/FormAction.vue';
 
   import { dateItemType } from './helper';
-  import moment from 'moment';
+  import { dateUtil } from '/@/utils/dateUtil';
+
   // import { cloneDeep } from 'lodash-es';
   import { deepMerge } from '/@/utils';
 
@@ -108,11 +109,11 @@
           // handle date type
           if (defaultValue && dateItemType.includes(component)) {
             if (!Array.isArray(defaultValue)) {
-              schema.defaultValue = moment(defaultValue);
+              schema.defaultValue = dateUtil(defaultValue);
             } else {
               const def: moment.Moment[] = [];
               defaultValue.forEach((item) => {
-                def.push(moment(item));
+                def.push(dateUtil(item));
               });
               schema.defaultValue = def;
             }

src/components/Form/src/BasicForm.vue

@@ -7,7 +7,7 @@ import { unref, toRaw } from 'vue';
 import { isArray, isFunction, isObject, isString } from '/@/utils/is';
 import { deepMerge, unique } from '/@/utils';
 import { dateItemType, handleInputNumberValue } from '../helper';
-import moment from 'moment';
+import { dateUtil } from '/@/utils/dateUtil';
 import { cloneDeep } from 'lodash-es';
 import { error } from '/@/utils/log';
 
@@ -67,11 +67,11 @@ export function useFormEvents({
           if (Array.isArray(value)) {
             const arr: moment.Moment[] = [];
             for (const ele of value) {
-              arr.push(moment(ele));
+              arr.push(dateUtil(ele));
             }
             formModel[key] = arr;
           } else {
-            formModel[key] = moment(value);
+            formModel[key] = dateUtil(value);
           }
         } else {
           formModel[key] = value;

src/components/Form/src/hooks/useFormEvents.ts

@@ -1,5 +1,6 @@
 import { isArray, isFunction, isObject, isString } from '/@/utils/is';
-import moment from 'moment';
+import { dateUtil } from '/@/utils/dateUtil';
+
 import { unref, nextTick } from 'vue';
 import type { Ref, ComputedRef } from 'vue';
 import type { FieldMapToTime, FormSchema } from '../types/form';
@@ -65,8 +66,8 @@ export function useFormValues({
 
       const [startTime, endTime]: string[] = values[field];
 
-      values[startTimeKey] = moment(startTime).format(format);
-      values[endTimeKey] = moment(endTime).format(format);
+      values[startTimeKey] = dateUtil(startTime).format(format);
+      values[endTimeKey] = dateUtil(endTime).format(format);
       Reflect.deleteProperty(values, field);
     }
 

src/components/Form/src/hooks/useFormValues.ts

@@ -3,8 +3,6 @@ import type { I18n, I18nOptions } from 'vue-i18n';
 
 import { createI18n } from 'vue-i18n';
 
-import 'moment/dist/locale/zh-cn';
-
 import projectSetting from '/@/settings/projectSetting';
 
 import messages from './getMessage';