فهرست منبع

删除配置中的sass-resource,让软件正常启动

liuwei 4 سال پیش
والد
کامیت
3e4d02b196
2فایلهای تغییر یافته به همراه11 افزوده شده و 98 حذف شده
  1. 1 8
      .electron-vue/webpack.renderer.config.js
  2. 10 90
      .idea/workspace.xml

+ 1 - 8
.electron-vue/webpack.renderer.config.js

@@ -33,14 +33,7 @@ let rendererConfig = {
     rules: [
       {
         test: /\.less$/,
-        use: ['vue-style-loader', 'css-loader', 'less-loader',
-          {
-            loader: 'sass-resources-loader',
-            options: {
-              resources: path.resolve(__dirname,'../src/renderer/assets/less/common.less'),//改路径为存放less全局变量的路径
-            }
-          }
-        ]
+        use: ['vue-style-loader', 'css-loader', 'less-loader']
       },
       {
         test: /\.css$/,

+ 10 - 90
.idea/workspace.xml

@@ -2,9 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="690c02a3-0e7d-4c4a-8f0c-a44c44c3a162" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/dist/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -21,50 +19,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="507">
-              <caret line="139" column="11" selection-start-line="139" selection-start-column="11" selection-end-line="139" selection-end-column="11" />
-              <folding>
-                <element signature="e#1096#1372#0" />
-                <element signature="e#1156#1362#0" />
-                <element signature="e#1224#1350#0" />
-                <element signature="e#1759#2140#0" />
-                <element signature="e#1812#2130#0" />
-                <element signature="e#1898#2118#0" />
-                <element signature="e#2218#2366#0" />
-                <element signature="e#2269#2356#0" />
-                <element signature="e#3164#3508#0" />
-                <element signature="e#4515#4571#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dist/electron/main.js">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/dist/electron/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="301" selection-start-column="301" selection-end-column="301" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/package.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-              <folding>
-                <element signature="n#!!block;n#directories#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="n#!!block;n#dmg#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="n#!!block;n#mac#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="n#!!block;n#win#0;n#!!block;n#build#0;n#!!top" />
-                <element signature="n#!!block;n#linux#0;n#!!block;n#build#0;n#!!top" />
-              </folding>
+            <state relative-caret-position="-189">
+              <caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -139,7 +95,6 @@
         <option value="$PROJECT_DIR$/src/utils/sliceColor.js" />
         <option value="$PROJECT_DIR$/static/EnityLable.json" />
         <option value="$PROJECT_DIR$/static/EnityImage.json" />
-        <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
         <option value="$PROJECT_DIR$/static/EnityLogin.json" />
         <option value="$PROJECT_DIR$/static/EnitySignalPreviewList.json" />
         <option value="$PROJECT_DIR$/src/renderer/assets/less/splitscreen.less" />
@@ -183,6 +138,7 @@
         <option value="$PROJECT_DIR$/src/renderer/api/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
         <option value="$PROJECT_DIR$/src/main/index.js" />
+        <option value="$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js" />
       </list>
     </option>
   </component>
@@ -212,22 +168,6 @@
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
               <item name=".electron-vue" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="dist" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="dist" type="462c0819:PsiDirectoryNode" />
-              <item name="electron" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -339,7 +279,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="419247000" />
+    <option name="totallyTimeSpent" value="419624000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -368,7 +308,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" weight="0.32910052" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.32910052" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.46666667" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.8137566" />
       <window_info anchor="bottom" id="TypeScript" order="11" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -773,13 +713,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/login.less" />
     <entry file="file://$PROJECT_DIR$/src/renderer/store/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -2681,9 +2615,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.Data">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnityBigScreen.Data" />
     <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
@@ -2746,20 +2678,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/.electron-vue/webpack.renderer.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="507">
-          <caret line="139" column="11" selection-start-line="139" selection-start-column="11" selection-end-line="139" selection-end-column="11" />
-          <folding>
-            <element signature="e#1096#1372#0" />
-            <element signature="e#1156#1362#0" />
-            <element signature="e#1224#1350#0" />
-            <element signature="e#1759#2140#0" />
-            <element signature="e#1812#2130#0" />
-            <element signature="e#1898#2118#0" />
-            <element signature="e#2218#2366#0" />
-            <element signature="e#2269#2356#0" />
-            <element signature="e#3164#3508#0" />
-            <element signature="e#4515#4571#0" />
-          </folding>
+        <state relative-caret-position="-189">
+          <caret line="12" column="49" lean-forward="true" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="49" />
         </state>
       </provider>
     </entry>