2 Commits e34232bcb0 ... a5f906b790

Author SHA1 Message Date
  maotao a5f906b790 Merge branch 'master' into develop 1 month ago
  maotao a7e617fdfd 拉取代码 1 month ago

+ 16 - 16
angular.json

@@ -35,20 +35,20 @@
35
             "styles": [
35
             "styles": [
36
               "src/styles.less",
36
               "src/styles.less",
37
               "src/assets/iconfont/iconfont.css",
37
               "src/assets/iconfont/iconfont.css",
38
-              "./node_modules/swiper/swiper-bundle.min.css",
39
-							"node_modules/prismjs/themes/prism-okaidia.css",
40
-							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
38
+              "./node_modules/swiper/swiper-bundle.min.css"
39
+							// "node_modules/prismjs/themes/prism-okaidia.css",
40
+							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
41
             ],
41
             ],
42
             "scripts": [
42
             "scripts": [
43
               "node_modules/echarts/dist/echarts.min.js",
43
               "node_modules/echarts/dist/echarts.min.js",
44
               "./node_modules/swiper/swiper-bundle.min.js",
44
               "./node_modules/swiper/swiper-bundle.min.js",
45
               "src/assets/libs/TLWebSocketAgent.js",
45
               "src/assets/libs/TLWebSocketAgent.js",
46
               "src/assets/libs/ola_api.js",
46
               "src/assets/libs/ola_api.js",
47
-							"node_modules/marked/lib/marked.js",
48
-							"node_modules/prismjs/prism.js",
49
-							"node_modules/prismjs/components/prism-csharp.min.js",
50
-							"node_modules/prismjs/components/prism-css.min.js",
51
-							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
47
+							"node_modules/marked/marked.min.js"
48
+							// "node_modules/prismjs/prism.js",
49
+							// "node_modules/prismjs/components/prism-csharp.min.js",
50
+							// "node_modules/prismjs/components/prism-css.min.js",
51
+							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
52
             ]
52
             ]
53
           },
53
           },
54
           "configurations": {
54
           "configurations": {
@@ -115,20 +115,20 @@
115
             "styles": [
115
             "styles": [
116
               "src/styles.less",
116
               "src/styles.less",
117
               "src/assets/iconfont/iconfont.css",
117
               "src/assets/iconfont/iconfont.css",
118
-              "./node_modules/swiper/swiper-bundle.min.css",
119
-							"node_modules/prismjs/themes/prism-okaidia.css",
120
-							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
118
+              "./node_modules/swiper/swiper-bundle.min.css"
119
+							// "node_modules/prismjs/themes/prism-okaidia.css",
120
+							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
121
             ],
121
             ],
122
             "scripts": [
122
             "scripts": [
123
               "node_modules/echarts/dist/echarts.min.js",
123
               "node_modules/echarts/dist/echarts.min.js",
124
               "./node_modules/swiper/swiper-bundle.min.js",
124
               "./node_modules/swiper/swiper-bundle.min.js",
125
               "src/assets/libs/TLWebSocketAgent.js",
125
               "src/assets/libs/TLWebSocketAgent.js",
126
               "src/assets/libs/ola_api.js",
126
               "src/assets/libs/ola_api.js",
127
-							"node_modules/marked/lib/marked.js",
128
-							"node_modules/prismjs/prism.js",
129
-							"node_modules/prismjs/components/prism-csharp.min.js",
130
-							"node_modules/prismjs/components/prism-css.min.js",
131
-							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
127
+							"node_modules/marked/marked.min.js"
128
+							// "node_modules/prismjs/prism.js",
129
+							// "node_modules/prismjs/components/prism-csharp.min.js",
130
+							// "node_modules/prismjs/components/prism-css.min.js",
131
+							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
132
             ]
132
             ]
133
           }
133
           }
134
         },
134
         },

+ 2 - 2
src/app/components/smart-dialogue/smart-dialogue.component.html

@@ -11,9 +11,9 @@
11
 				</div>
11
 				</div>
12
 				<div class="content-message" [ngClass]="{'user-message' : message.role === 'user','bot-message': message.role === 'assistant'}">
12
 				<div class="content-message" [ngClass]="{'user-message' : message.role === 'user','bot-message': message.role === 'assistant'}">
13
 					<!-- <div markdown [data]="message.content" *ngIf="message.role=='assistant'"></div> -->
13
 					<!-- <div markdown [data]="message.content" *ngIf="message.role=='assistant'"></div> -->
14
-					<!-- <markdown lineNumbers ># Hello, Markdown!</markdown> -->
14
+					<markdown data="123456"></markdown>
15
 					<!-- <div *ngIf="message.role=='user'">{{message.content}}</div> -->
15
 					<!-- <div *ngIf="message.role=='user'">{{message.content}}</div> -->
16
-					{{message.content}}
16
+					<!-- {{message.content}} -->
17
 				</div>
17
 				</div>
18
 			</div>
18
 			</div>
19
 		</div>
19
 		</div>

+ 1 - 1
src/app/components/smart-dialogue/smart-dialogue.module.ts

@@ -12,7 +12,7 @@ import { MarkdownModule } from 'ngx-markdown';
12
   imports: [
12
   imports: [
13
     CommonModule,
13
     CommonModule,
14
     ShareModule,
14
     ShareModule,
15
-		MarkdownModule.forChild()
15
+		MarkdownModule.forRoot()
16
   ],
16
   ],
17
   exports: [
17
   exports: [
18
     SmartDialogueComponent
18
     SmartDialogueComponent

+ 2 - 2
src/app/views/hushijiandan/hushijiandan.component.html

@@ -2730,9 +2730,9 @@
2730
   </div>
2730
   </div>
2731
 </nz-modal>
2731
 </nz-modal>
2732
 
2732
 
2733
-<!-- <div class="kefu" (click)="smartOpen()">
2733
+<div class="kefu" (click)="smartOpen()">
2734
 	<img src="../../assets/images/kefu.png" alt="">
2734
 	<img src="../../assets/images/kefu.png" alt="">
2735
-</div> -->
2735
+</div>
2736
 
2736
 
2737
 <!-- 快捷方式建单弹窗 -->
2737
 <!-- 快捷方式建单弹窗 -->
2738
 <app-build-quick-confirm *ngIf="isShowBuildQuickConfirm" [buildQuickConfirmData]="buildQuickConfirmData" (cancelModal)="cancelBuildQuickConfirm($event)" (confirmModal)="confirmBuildQuickConfirm($event)" [loading5]="loadingQuick"></app-build-quick-confirm>
2738
 <app-build-quick-confirm *ngIf="isShowBuildQuickConfirm" [buildQuickConfirmData]="buildQuickConfirmData" (cancelModal)="cancelBuildQuickConfirm($event)" (confirmModal)="confirmBuildQuickConfirm($event)" [loading5]="loadingQuick"></app-build-quick-confirm>

+ 3 - 3
src/app/views/hushijiandan/hushijiandan.module.ts

@@ -8,13 +8,12 @@ import { DragModule } from 'src/app/directives/drag/drag.module';
8
 import { SortablejsModule } from 'ngx-sortablejs';
8
 import { SortablejsModule } from 'ngx-sortablejs';
9
 import { NgxPrintModule } from 'ngx-print';
9
 import { NgxPrintModule } from 'ngx-print';
10
 import { BuildQuickConfirmComponent } from 'src/app/components/build-quick-confirm/build-quick-confirm.component';
10
 import { BuildQuickConfirmComponent } from 'src/app/components/build-quick-confirm/build-quick-confirm.component';
11
-import { SmartDialogueComponent } from 'src/app/components/smart-dialogue/smart-dialogue.component';
11
+import { SmartDialogueModule } from 'src/app/components/smart-dialogue/smart-dialogue.module';
12
 
12
 
13
 @NgModule({
13
 @NgModule({
14
   declarations: [
14
   declarations: [
15
     HushijiandanComponent,
15
     HushijiandanComponent,
16
-    BuildQuickConfirmComponent,
17
-		SmartDialogueComponent,
16
+    BuildQuickConfirmComponent
18
   ],
17
   ],
19
   imports: [
18
   imports: [
20
     CommonModule,
19
     CommonModule,
@@ -23,6 +22,7 @@ import { SmartDialogueComponent } from 'src/app/components/smart-dialogue/smart-
23
     SortablejsModule,
22
     SortablejsModule,
24
     HushijiandanRoutingModule,
23
     HushijiandanRoutingModule,
25
     NgxPrintModule,
24
     NgxPrintModule,
25
+		SmartDialogueModule
26
   ]
26
   ]
27
 })
27
 })
28
 export class HushijiandanModule { }
28
 export class HushijiandanModule { }