fix: code editor language highlight

hsuanxyz · hsuanxyz · commit 03ff8d58ac7e · 2019-10-30T11:04:24.000+08:00
diff --git a/zeppelin-frontend/src/app/app.module.ts b/zeppelin-frontend/src/app/app.module.ts
@@ -9,13 +9,13 @@ import { Router, RouterModule } from '@angular/router';
 
 import { ZeppelinHeliumModule } from '@zeppelin/helium';
 import { en_US, NzModalService, NzNotificationService, NZ_I18N } from 'ng-zorro-antd';
-import { NZ_CODE_EDITOR_CONFIG } from 'ng-zorro-antd/code-editor';
 
 import { MESSAGE_INTERCEPTOR, TRASH_FOLDER_ID_TOKEN } from '@zeppelin/interfaces';
 import { loadMonacoLanguage } from '@zeppelin/languages';
 import { TicketService } from '@zeppelin/services';
 import { ShareModule } from '@zeppelin/share';
 
+import { NZ_CODE_EDITOR_CONFIG } from '@zeppelin/share/code-editor';
 import { AppHttpInterceptor } from './app-http.interceptor';
 import { AppMessageInterceptor } from './app-message.interceptor';
 import { AppRoutingModule } from './app-routing.module';
diff --git a/zeppelin-frontend/src/app/helium-manager/helium-manager.service.ts b/zeppelin-frontend/src/app/helium-manager/helium-manager.service.ts
@@ -35,7 +35,8 @@ export class HeliumManagerService implements OnDestroy {
   }
 
   getEnabledPackages() {
-    return of(['helium-vis-example']);
+    // return of(['helium-vis-example']);
+    return of([]);
   }
 
   packagesLoadChange() {
diff --git a/zeppelin-frontend/src/app/languages/load.ts b/zeppelin-frontend/src/app/languages/load.ts
@@ -1,7 +1,8 @@
+import { languages } from 'monaco-editor';
 import { conf as ScalaConf, language as ScalaLanguage } from './scala';
 
 export const loadMonacoLanguage = () => {
-  monaco.languages.register({ id: 'scala' });
-  monaco.languages.setMonarchTokensProvider('scala', ScalaLanguage);
-  monaco.languages.setLanguageConfiguration('scala', ScalaConf);
+  languages.register({ id: 'scala' });
+  languages.setMonarchTokensProvider('scala', ScalaLanguage);
+  languages.setLanguageConfiguration('scala', ScalaConf);
 };
diff --git a/zeppelin-frontend/src/app/pages/workspace/notebook/paragraph/result/result.component.html b/zeppelin-frontend/src/app/pages/workspace/notebook/paragraph/result/result.component.html
@@ -14,7 +14,7 @@
     <button nz-button (click)="exportFile('csv')">
       <i nz-icon nzType="download" nz-tooltip="Download Data as CSV"></i>
     </button>
-    <button nz-button nz-dropdown [nzDropdownMenu]="exportMenu" nzPlacement="bottomRight">
+    <button class="export-dropdown-icon-btn" nz-button nz-dropdown [nzDropdownMenu]="exportMenu" nzPlacement="bottomRight">
       <i nz-icon nzType="down"></i>
     </button>
   </nz-button-group>
diff --git a/zeppelin-frontend/src/app/pages/workspace/notebook/paragraph/result/result.component.less b/zeppelin-frontend/src/app/pages/workspace/notebook/paragraph/result/result.component.less
@@ -44,6 +44,13 @@
 
     .export-dropdown {
       margin: 0 20px;
+
+      .export-dropdown-icon-btn {
+        width: 32px;
+        height: 32px;
+        padding: 0;
+        font-size: 16px;
+      }
     }
 
     .setting-trigger {
diff --git a/zeppelin-frontend/src/app/visualizations/common/pivot-setting/pivot-setting.component.less b/zeppelin-frontend/src/app/visualizations/common/pivot-setting/pivot-setting.component.less
@@ -9,4 +9,7 @@
   .drag-wrap {
     min-height: 23px;
   }
+  nz-card {
+    background: #fff;
+  }
 });
diff --git a/zeppelin-frontend/src/app/visualizations/common/scatter-setting/scatter-setting.component.less b/zeppelin-frontend/src/app/visualizations/common/scatter-setting/scatter-setting.component.less
@@ -9,4 +9,7 @@
   .drag-wrap {
     min-height: 23px;
   }
+  nz-card {
+    background: #fff;
+  }
 });

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ export class HeliumManagerService implements OnDestroy {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`getEnabledPackages() {`
`38`		`- return of(['helium-vis-example']);`
	`38`	`+ // return of(['helium-vis-example']);`
	`39`	`+ return of([]);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`packagesLoadChange() {`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,7 @@`
`9`	`9`	`.drag-wrap {`
`10`	`10`	`min-height: 23px;`
`11`	`11`	`}`
	`12`	`+ nz-card {`
	`13`	`+ background: #fff;`
	`14`	`+ }`
`12`	`15`	`});`