require 修改成 import

.eslintrc.js

@@ -65,7 +65,11 @@ module.exports = {
     "vue/v-on-event-hyphenation": ["warn", "always", {
       "autofix": true,
       "ignore": []
-    }]
+    }],
+
+    "quotes": [1, "single"],
+
+    "comma-style": [2, "last"]
 
   },
   "globals":{

packages/amis/src/AmisWidget.vue

@@ -11,9 +11,9 @@ import 'amis/lib/helper.css';
 import 'amis/sdk/iconfont.css';
 import { amisConfig } from './AmisConfig.js';
 
-var AmisWindowResource = require('./AmisWindowResource.js');
-var Common = require('../../common/Common.js').default;
-var Notify = require('../../common/Notify.js').default;
+import AmisWindowResource from './AmisWindowResource.js';
+import Common from '../../common/Common.js';
+import Notify from '../../common/Notify.js';
 
 export default {
 

packages/amis/src/AmisWindowResource.js

@@ -1,10 +1,12 @@
-var Common = require('../../common/Common.js').default;
+import Common from '../../common/Common.js';
+
+
 /**
  * 工具类自动生成的API，请勿做任何修改，请勿做任何修改，请勿做任何修改（重要的事情说3遍）
  * 工具作者: 杨志杰
  *  
  */
-module.exports = {
+export default {
 
   /**
 	 * 工具类自动生成的方法

packages/client-organization/src/ClientOrganization.vue

@@ -23,10 +23,10 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-var Notify = require('../../common/Notify.js').default;
-var Loading = require('../../loading/src/Loading.vue').default;
-var TreeViewNode = require('../../tree/src/TreeViewNode.vue').default;
+import Common from '../../common/Common.js';
+import Notify from '../../common/Notify.js';
+import Loading from '../../loading/src/Loading.vue';
+import TreeViewNode from '../../tree/src/TreeViewNode.vue';
 
 export default {
   name: 'ClientOrganization',

packages/common/Common.js

@@ -1,4 +1,4 @@
-var Notify = require('./Notify.js').default;
+import Notify from './Notify.js';
 
 
 export default {

packages/common/DownloadService.js

@@ -1,4 +1,4 @@
-var Common = require('./Common.js').default;
+import Common from './Common.js';
 
 /**
  * 报表下载服务

packages/common/Notify.js

@@ -1,4 +1,4 @@
-var ModalFix = require('../modal/src/ModalFix.JS').default;
+import ModalFix from '../modal/src/ModalFix.JS';
 
 export default {
   /**

packages/common/SqlApi.js

@@ -1,4 +1,4 @@
-var Common = require('./Common.js').default;
+import Common from './Common.js';
 
 export default {
 

packages/common/UserStorageResource.js

@@ -1,4 +1,4 @@
-var Common = require('./Common.js').default;
+import Common from './Common.js';
 
 /**
  * 工具类自动生成的API，请勿做任何修改，请勿做任何修改，请勿做任何修改（重要的事情说3遍）

packages/customer-window/src/api/CustomerWindowResource.js

@@ -1,4 +1,5 @@
-var Common = require('../../../common/Common.js').default;
+import Common from '../../../common/Common.js';
+
 
 /**
  * 工具类自动生成的API，请勿做任何修改，请勿做任何修改，请勿做任何修改（重要的事情说3遍）

packages/date/src/Date.vue

@@ -8,8 +8,8 @@
 </template>
 
 <script>
-var VueDatepicker = require('../../vue-datepicker/src/vue-datepicker.vue').default;
-var VueDatepickerOption0 = require('./vue-datepicker-setting.js').default;
+import VueDatepicker from '../../vue-datepicker/src/vue-datepicker.vue';
+import VueDatepickerOption0 from './vue-datepicker-setting.js';
 
 export default {
   // eslint-disable-next-line

packages/datetime-v2/src/DateTimeV2.vue

@@ -32,6 +32,8 @@
 
 <script>
 
+import moment from 'moment';
+
 export default {
 
   name: 'DateTimeV2',

packages/datetime/src/DateTime.vue

@@ -8,8 +8,8 @@
 </template>
 
 <script>
-var VueDatepicker = require('../../vue-datepicker/src/vue-datepicker.vue').default;
-var VueDatepickerOption1 = require('./vue-datepicker-setting.js').default;
+import VueDatepicker from '../../vue-datepicker/src/vue-datepicker.vue';
+import VueDatepickerOption1 from './vue-datepicker-setting.js';
 
 export default {
   name: 'DateTime',

packages/html-window/src/api/HtmlWindowResource.js

@@ -1,4 +1,4 @@
-var Common = require('../../../common/Common.js').default;
+import Common from '../../../common/Common.js';
 
 /**
  * 工具类自动生成的API，请勿做任何修改，请勿做任何修改，请勿做任何修改（重要的事情说3遍）

packages/image-preview/src/ImagePreview.vue

@@ -21,8 +21,8 @@
 
 
 <script>
-var Common = require('../../common/Common.js').default;
-var Modal = require('../../modal/src/Modal.vue').default;
+import Common from '../../common/Common.js';
+import Modal from '../../modal/src/Modal.vue';
 
 export default {
   name: 'ImagePreview',

packages/info/src/DocGenerator.vue

@@ -54,12 +54,12 @@
   </div>
 </template>
 <script>
-var Common = require('../../common/Common.js').default;
-var InfoUtil = require('./InfoUtil.js').default;
-var Loading = require('../../loading/src/Loading.vue').default;
-var QueryCondition = require('./QueryCondition.vue').default;
-var DocGeneratorSelected = require('./DocGeneratorSelected.vue').default;
-var DocGeneratorGrid = require('./DocGeneratorGrid.vue').default;
+import Common from '../../common/Common.js';
+import InfoUtil from './InfoUtil.js';
+import Loading from '../../loading/src/Loading.vue';
+import QueryCondition from './QueryCondition.vue';
+import DocGeneratorSelected from './DocGeneratorSelected.vue';
+import DocGeneratorGrid from './DocGeneratorGrid.vue';
 
 export default {
   name: 'DocGenerator',

packages/info/src/DocGeneratorGrid.vue

@@ -115,10 +115,10 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-var InfoUtil = require('./InfoUtil.js').default;
-var Pagination = require('../../vue-bootstrap-pagination/src/vue-bootstrap-pagination.vue').default;
-var PageSizeSelect = require('../../page-size-select/src/PageSizeSelect.vue').default;
+import Common from '../../common/Common.js';
+import InfoUtil from './InfoUtil.js';
+import Pagination from '../../vue-bootstrap-pagination/src/vue-bootstrap-pagination.vue';
+import PageSizeSelect from '../../page-size-select/src/PageSizeSelect.vue';
 
 export default {
 

packages/info/src/DocGeneratorSelected.vue

@@ -103,9 +103,9 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-var Notify = require('../../common/Notify.js').default;
-var InfoUtil = require('./InfoUtil.js').default;
+import Common from '../../common/Common.js';
+import Notify from '../../common/Notify.js';
+import InfoUtil from './InfoUtil.js';
 
 export default {
 

packages/info/src/InfoUtil.js

@@ -1,5 +1,5 @@
-var UserStorageResource = require('../../common/UserStorageResource.js').default;
-var Common = require('../../common/Common.js').default;
+import UserStorageResource from '../../common/UserStorageResource.js';
+import Common from '../../common/Common.js';
 
 
 export default {

packages/info/src/MultiSearchWidget.vue

@@ -50,8 +50,8 @@
 <script>
 import { defineAsyncComponent } from 'vue';
 
-var Modal = require('../../modal/src/Modal.vue').default;
-var Loading = require('../../loading/src/Loading.vue').default;
+import Modal from '../../modal/src/Modal.vue';
+import Loading from '../../loading/src/Loading.vue';
 
 export default {
 

packages/info/src/QueryCondition.vue

@@ -60,9 +60,9 @@
 </template>
 
 <script>
-var InfoWindowUtil = require('./InfoWindowUtil.js').default;
-var QueryConditionSimple = require('./QueryConditionSimple.vue').default;
-var QueryConditionComplex = require('./QueryConditionComplex.vue').default;
+import InfoWindowUtil from './InfoWindowUtil.js';
+import QueryConditionSimple from './QueryConditionSimple.vue';
+import QueryConditionComplex from './QueryConditionComplex.vue';
 
 export default {
   name: 'QueryCondition',

packages/info/src/QueryConditionComplex.vue

@@ -259,12 +259,12 @@
 <script>
 import { defineAsyncComponent } from 'vue';
 
-var EnumSelectWidgetInfo = require('./EnumSelectWidgetInfo.vue').default;
-var DateTimeV2 = require('../../datetime-v2/src/DateTimeV2.vue').default;
-var YearPicker = require('../../year-picker/src/YearPicker.vue').default;
-var DateWidget = require('../../date/src/Date.vue').default;
-var VueMonthlyPicker = require('../../vue-monthly-picker/src/VueMonthlyPicker.vue').default;
-var Language = require('../../common/Language.js').default;
+import EnumSelectWidgetInfo from './EnumSelectWidgetInfo.vue';
+import DateTimeV2 from '../../datetime-v2/src/DateTimeV2.vue';
+import YearPicker from '../../year-picker/src/YearPicker.vue';
+import DateWidget from '../../date/src/Date.vue';
+import VueMonthlyPicker from '../../vue-monthly-picker/src/VueMonthlyPicker.vue';
+import Language from '../../common/Language.js';
 
 export default {
 

packages/info/src/QueryConditionSimple.vue

@@ -57,7 +57,7 @@
 
 <script>
 
-var Language = require('../../common/Language.js').default;
+import Language from '../../common/Language.js';
 
 export default {
 

packages/info/src/QueryPage.vue

@@ -177,30 +177,32 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-var Modal = require('../../modal/src/Modal.vue').default;
+import Common from '../../common/Common.js';
+import Modal from '../../modal/src/Modal.vue';
 
-var PageSizeSelect = require('../../page-size-select/src/PageSizeSelect.vue').default;
-var Pagination = require('../../vue-bootstrap-pagination/src/vue-bootstrap-pagination.vue').default;
+import PageSizeSelect from '../../page-size-select/src/PageSizeSelect.vue';
+import Pagination from '../../vue-bootstrap-pagination/src/vue-bootstrap-pagination.vue';
 
-var QueryCondition = require('./QueryCondition.vue').default;
-var InfoHeader = require('./InfoHeader.vue').default;
-var InfoUtil = require('./InfoUtil.js').default;
-var Notify = require('../../common/Notify.js').default;
+import QueryCondition from './QueryCondition.vue';
+import InfoHeader from './InfoHeader.vue';
+import InfoUtil from './InfoUtil.js';
+import Notify from '../../common/Notify.js';
 
-var Loading = require('../../loading/src/Loading.vue').default;
-var ProcessReportResult = require('../../process/src/ProcessReportResult.vue').default;
-var Uuid = require('../../common/Uuid.js').default;
-var QueryPageImage = require('./QueryPageImage.vue').default;
+import Loading from '../../loading/src/Loading.vue';
+import ProcessReportResult from '../../process/src/ProcessReportResult.vue';
+import Uuid from '../../common/Uuid.js';
+import QueryPageImage from './QueryPageImage.vue';
 
-var DownloadService = require('../../common/DownloadService.js').default;
-var HtmlWindowResource = require('../../html-window/src/api/HtmlWindowResource.js').default;
-var CustomerWindowResource = require('../../customer-window/src/api/CustomerWindowResource.js').default;
-var ProcessReportResource = require('../../process/src/api/ProcessReportResource.js').default;
+import DownloadService from '../../common/DownloadService.js';
+import HtmlWindowResource from '../../html-window/src/api/HtmlWindowResource.js';
+import CustomerWindowResource from '../../customer-window/src/api/CustomerWindowResource.js';
+import ProcessReportResource from '../../process/src/api/ProcessReportResource.js';
 
-var UserStorageResource = require('../../common/UserStorageResource.js').default;
+import UserStorageResource from '../../common/UserStorageResource.js';
 
-var Language = require('../../common/Language.js').default;
+import Language from '../../common/Language.js';
+
+import moment from 'moment';
 
 export default {
 

packages/info/src/QueryPageImage.vue

@@ -48,8 +48,8 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-var Modal = require('../../modal/src/Modal.vue').default;
+import Common from '../../common/Common.js';
+import Modal from '../../modal/src/Modal.vue';
 
 export default {
 

packages/info/src/SearchAutoCompleteWidget.vue

@@ -42,7 +42,7 @@
   </div>
 </template>
 <script>
-var Common = require('../../common/Common.js').default;
+import Common from '../../common/Common.js';
 
 export default {
   name: 'SearchAutoCompleteWidget',

packages/info/src/SearchWidget.vue

@@ -65,10 +65,10 @@
 
 <script>
 import { defineAsyncComponent } from 'vue';
-var Modal = require('../../modal/src/Modal.vue').default;
-var InfoWindow = require('./InfoWindow.vue').default;
-var SearchAutoCompleteWidget = require('./SearchAutoCompleteWidget.vue').default;
-var Loading = require('../../loading/src/Loading.vue').default;
+import Modal from '../../modal/src/Modal.vue';
+import InfoWindow from './InfoWindow.vue';
+import SearchAutoCompleteWidget from './SearchAutoCompleteWidget.vue';
+import Loading from '../../loading/src/Loading.vue';
 
 export default {
 

packages/loading/src/Loading.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-var UUID = require('../../common/Uuid.js').default;
+import UUID from '../../common/Uuid.js';
 
 export default {
   // eslint-disable-next-line

packages/modal/src/Modal.vue

@@ -61,7 +61,7 @@
 
 <script>
 
-var ModalFix = require('./ModalFix.js').default;
+import ModalFix from './ModalFix.js';
 
 export default {
   // eslint-disable-next-line

packages/page-size-select/src/SizePagination.vue

@@ -41,9 +41,9 @@
 // <script>
 
 // // 外部可以注册事件pageSizeChanged
-// var Pagination = require("vue-bootstrap-pagination").default;
+// import Pagination from "vue-bootstrap-pagination";
 
-// module.exports = {
+// export default  {
 //     name: "SizePagination",
 
 //     /**

packages/print/src/PrintEpc.vue

@@ -70,9 +70,9 @@
 </template>
 
 <script>
-var PrintEpcUtil = require('./PrintEpcUtil.js').default;
-var Modal = require('../../modal/src/Modal.vue').default;
-var Loading = require('../../loading/src/Loading.vue').default;
+import PrintEpcUtil from './PrintEpcUtil.js';
+import Modal from '../../modal/src/Modal.vue';
+import Loading from '../../loading/src/Loading.vue';
 
 export default {
   name: 'PrintEpc',

packages/print/src/PrintEpcUtil.js

@@ -2,7 +2,7 @@
 /**
  * node-red EPC 发卡程序
  */
-var Uuid = require('../../common/Uuid.js').default;
+import Uuid from '../../common/Uuid.js';
 
 
 export default {

packages/print/src/PrintUtil.js

@@ -3,8 +3,8 @@
  * node-red打印程序
  */
 
-var Common = require('../../common/Common.js').default;
-var Uuid = require('../../common/Uuid.js').default;
+import Common from '../../common/Common.js';
+import Uuid from '../../common/Uuid.js';
 
 
 export default {

packages/print/src/PrintWidget.vue

@@ -29,7 +29,7 @@
 
 <script>
 
-var PrintUtil = require('./PrintUtil.js').default;
+import PrintUtil from './PrintUtil.js';
 
 export default {
   name: 'PrintWidget',

packages/process/src/ProcessReport.vue

@@ -15,9 +15,9 @@
 
 <script>
 
-var Common = require('../../common/Common.js').default;
-var ProcessReportDynamic = require('./ProcessReportDynamic.vue').default;
-var ProcessReportStatic = require('./ProcessReportStatic.vue').default;
+import Common from '../../common/Common.js';
+import ProcessReportDynamic from './ProcessReportDynamic.vue';
+import ProcessReportStatic from './ProcessReportStatic.vue';
 
 export default {
   name: 'ProcessReport',

packages/process/src/ProcessReportArchive.vue

@@ -100,9 +100,9 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-var Notify = require('../../common/Notify.js').default;
-var DateTimeWidget = require('../../datetime/src/DateTime.vue').default;
+import Common from '../../common/Common.js';
+import Notify from '../../common/Notify.js';
+import DateTimeWidget from '../../datetime/src/DateTime.vue';
 
 export default {
 

packages/process/src/ProcessReportDynamic.vue

@@ -144,14 +144,14 @@
 <script>
 import { defineAsyncComponent } from 'vue';
 
-var Common = require('../../common/Common.js').default;
-
-var Navbar = require('../../navbar/src/Navbar.vue').default;
-var DateTime = require('../../datetime/src/DateTime.vue').default;
-var Loading = require('../../loading/src/Loading.vue').default;
-var ProcessReportResultPreview = require('./ProcessReportResultPreview.vue').default;
-var SearchWidget = require('../../info/src/SearchWidget.vue').default;
-var Switches = require('../../switches/src/Switches.vue').default;
+import Common from '../../common/Common.js';
+
+import Navbar from '../../navbar/src/Navbar.vue';
+import DateTime from '../../datetime/src/DateTime.vue';
+import Loading from '../../loading/src/Loading.vue';
+import ProcessReportResultPreview from './ProcessReportResultPreview.vue';
+import SearchWidget from '../../info/src/SearchWidget.vue';
+import Switches from '../../switches/src/Switches.vue';
 
 
 

packages/process/src/ProcessReportResult.vue

@@ -76,9 +76,9 @@
 </template>
 
 <script>
-var Common = require('../../common/Common.js').default;
-// var ProcessReportArchive = require('./ProcessReportArchive.vue').default;
-var DownloadService = require('../../common/DownloadService.js').default;
+import Common from '../../common/Common.js';
+// import ProcessReportArchive from './ProcessReportArchive.vue';
+import DownloadService from '../../common/DownloadService.js';
 
 export default {
   name: 'ProcessReportResult',

packages/process/src/ProcessReportResultPreview.vue

@@ -141,11 +141,11 @@
 
 <script>
 
-var Common = require('../../common/Common.js').default;
-var Uuid = require('../../common/Uuid.js').default;
-var Notify = require('../../common/Notify.js').default;
-var DownloadService = require('../../common/DownloadService.js').default;
-var ProcessReportArchive = require('./ProcessReportArchive.vue').default;
+import Common from '../../common/Common.js';
+import Uuid from '../../common/Uuid.js';
+import Notify from '../../common/Notify.js';
+import DownloadService from '../../common/DownloadService.js';
+import ProcessReportArchive from './ProcessReportArchive.vue';
 
 export default {
   name: 'ProcessReportResultPreview',

packages/process/src/ProcessReportStatic.vue

@@ -152,16 +152,17 @@
 <script>
 import { defineAsyncComponent } from 'vue';
 
-var Common = require('../../common/Common.js').default;
-var DateTime = require('../../datetime/src/DateTime.vue').default;
-var YearPicker = require('../../year-picker/src/YearPicker.vue').default;
-var Loading = require('../../loading/src/Loading.vue').default;
-var ProcessReportResultPreview = require('./ProcessReportResultPreview.vue').default;
-var SearchWidget = require('../../info/src/SearchWidget.vue').default;
-var Switches = require('../../switches/src/Switches.vue').default;
-var Navbar = require('../../navbar/src/Navbar.vue').default;
-var VueMonthlyPicker = require('../../vue-monthly-picker/src/VueMonthlyPicker.vue').default;
-var EnumSelectWidget = require('./EnumSelectWidget.vue').default;
+import moment from 'moment';
+import Common from '../../common/Common.js';
+import DateTime from '../../datetime/src/DateTime.vue';
+import YearPicker from '../../year-picker/src/YearPicker.vue';
+import Loading from '../../loading/src/Loading.vue';
+import ProcessReportResultPreview from './ProcessReportResultPreview.vue';
+import SearchWidget from '../../info/src/SearchWidget.vue';
+import Switches from '../../switches/src/Switches.vue';
+import Navbar from '../../navbar/src/Navbar.vue';
+import VueMonthlyPicker from '../../vue-monthly-picker/src/VueMonthlyPicker.vue';
+import EnumSelectWidget from './EnumSelectWidget.vue';
 
 
 

packages/process/src/api/ProcessReportResource.js

@@ -1,4 +1,4 @@
-const Common = require('../../../common/Common.js').default;
+import Common from '../../../common/Common.js';
 
 /**
  * 工具类自动生成的API，请勿做任何修改，请勿做任何修改，请勿做任何修改（重要的事情说3遍）

packages/scanner/src/Scanner.vue

@@ -37,6 +37,7 @@
 
 <script>
 
+import moment from 'moment';
 
 export default {
   name: 'Scanner',  // eslint-disable-line

packages/vue-datepicker/src/vue-datepicker.vue

@@ -162,7 +162,7 @@ Object.defineProperty(exports, '__esModule', {
   value: true,
 });
 
-var _moment = require('moment');
+import _moment from 'moment';
 
 var _moment2 = _interopRequireDefault(_moment);
 

webpack.lib.js

@@ -1,7 +1,7 @@
-var path = require('path')
-var webpack = require('webpack')
-const WebpackMerge = require('webpack-merge')
-const baseConfig = require('./webpack.base.js')
+var path = require('path');
+var webpack = require('webpack');
+const WebpackMerge = require('webpack-merge');
+const baseConfig = require('./webpack.base.js');
 
 module.exports = WebpackMerge.merge(baseConfig,{
   mode: 'production',