Merge branch 'master' of http://git.fmode.cn:3000/19808003398/20222670105

novel-app/src/app/atest/atest.page.ts

@@ -15,7 +15,8 @@ import { AvatarModule, ChatPanelOptions, DalleOptions, FmodeChat, FmodeChatCompl
     IonIcon,IonCard,IonCardHeader,IonCardTitle,
     IonCardSubtitle,IonCardContent, IonThumbnail, IonItem,IonList,CommonModule,IonLabel,
     IonAvatar, IonSelect, IonSelectOption,IonButtons,IonProgressBar,
-    IonText, IonCardHeader, IonCardSubtitle,]
+    IonText, IonCardHeader, IonCardSubtitle,
+  ]
 })
 export class AtestPage implements OnInit {
 

novel-app/src/app/chapter-generator/chapter-generator.page.ts

@@ -9,7 +9,8 @@ import { CommonModule } from '@angular/common';
 import { AiExpandModalComponent } from '../ai-expand-modal/ai-expand-modal.component';
 import { AiPolishModalComponent } from '../ai-polish-modal/ai-polish-modal.component';
 import { AiContinueModalComponent } from '../ai-continue-modal/ai-continue-modal.component';
-
+import { OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 addIcons({ chevronForward });
 
 @Component({
@@ -18,11 +19,16 @@ addIcons({ chevronForward });
   styleUrls: ['./chapter-generator.page.scss'],
   standalone: true,
   imports: [
-    FormsModule, // 添加 FormsModule
-    IonRouterOutlet, CommonModule, IonicModule, AiExpandModalComponent, AiPolishModalComponent, AiContinueModalComponent
-  ]
+    FormsModule,
+    IonRouterOutlet,
+    CommonModule,
+    IonicModule,
+    AiExpandModalComponent,
+    AiPolishModalComponent,
+    AiContinueModalComponent
+    ]
 })
-export class ChapterGeneratorPage {
+export class ChapterGeneratorPage implements OnInit {
   chapters = [
     { title: 'Chapter 1', content: '这是第一章的内容。' },
     // 其他章节...
@@ -32,8 +38,19 @@ export class ChapterGeneratorPage {
   selectedChapterTitle: string = '';
   selectedChapterContent: string = '';
 
-  constructor(private modalCtrl: ModalController) { }
+  title: string = '';
+  description: string = '';
+
+  constructor(private modalCtrl: ModalController, private route: ActivatedRoute) { }
 
+  ngOnInit() {
+    this.route.queryParams.subscribe(params => {
+      this.title = params['title'];
+      this.description = params['description'];
+      console.log('Received Title:', this.title);
+      console.log('Received Description:', this.description);
+    });
+  }
   async openAiExpandModal() {
     const modal = await this.modalCtrl.create({
       component: AiExpandModalComponent,

novel-app/src/app/comp-word-entry/comp-word-entry.component.html

@@ -1,7 +1,7 @@
 @for(entry of entryList;let idx = $index;track entry){
   <ion-card>
     <ion-card-header>
-          <ion-card-title>{{entry?.title || "新词条"}}
+          <ion-card-title>{{entry?.name || "新词条"}}
           <ion-button (click)="deleteEntry(idx)" color="danger">删除</ion-button>
 
           </ion-card-title>
@@ -14,7 +14,7 @@
             <ion-select-option value="道具">道具</ion-select-option>
             <ion-select-option value="场景">场景</ion-select-option>
           </ion-select>
-          <ion-input [value]="entry.title" (ionChange)="onIonChange(entry,'title',$event)" placeholder="请输入词条名称"></ion-input>
+          <ion-input [value]="entry.name" (ionChange)="onIonChange(entry,'name',$event)" placeholder="请输入词条名称"></ion-input>
         </ion-item>
         <ion-item>
           <ion-input label="标签" [value]="entry.newTag" (ionChange)="onIonChange(entry,'newTag',$event)"></ion-input>

novel-app/src/app/comp-word-entry/comp-word-entry.component.ts

@@ -3,7 +3,7 @@ import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, Ion
 
 
 interface WordEntry{
-  title :string // 名称
+  name :string // 名称
   type:"人物"|"道具"|"场景" // 类型
   important:"重要"|"不重要" //  重要程度
   desc:string // 词条简介
@@ -46,7 +46,7 @@ export class CompWordEntryComponent  implements OnInit {
 
   addEntry(){
     this.entryList.push({
-      title:"",
+      name:"",
       type:"人物",
       important:"重要",
       desc:"简介"

novel-app/src/app/component/article-card/article-card.component.html

@@ -1,10 +1,11 @@
 <div class="card">
-  <img [src]="card.get('image')[0]" alt="Image">
+  <!-- <img [src]="card.get('image')[0]" alt="Image"> -->
   <div class="content">
     <h3>{{ card.get('title') }}</h3>
-    <p>{{ card.get('topic') }} &nbsp; {{ card.get('date') }}</p>
-    <p>
+    <p>焚枯食淡荆防颗粒收到了发</p>
+    <!-- <p>{{ card.get('topic') }} &nbsp; {{ card.get('date') }}</p> -->
+    <!-- <p>
       阅读量: {{ card.get('views') }} &nbsp; 赞: {{ card.get('likes') }}
-    </p>
+    </p> -->
   </div>
 </div>

novel-app/src/app/short-generator/short-generator.page.html

@@ -10,8 +10,8 @@
 <ion-content class="ion-padding">
 
   <h1>标题</h1>
-  <ion-input [value]="title" (ionInput)="titleInput($event)"></ion-input>
-  <h1>风格</h1>
+  <ion-input [value]="titlel" placeholder="输入标题" (ionInput)="titleInput($event)"></ion-input>
+  <h1>要求</h1>
   <ion-input [value]="style" (ionInput)="styleInput($event)"></ion-input>
 
   <!-- 词条列表编辑区域 -->

novel-app/src/app/short-generator/short-generator.page.ts

@@ -1,10 +1,16 @@
 import { Component, OnInit } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
+import { IonicModule, LoadingController } from '@ionic/angular';
 import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
 import { FmodeChatCompletion, MarkdownPreviewModule } from 'fmode-ng';
 import { CompWordEntryComponent } from '../comp-word-entry/comp-word-entry.component';
 
+
+import { CloudObject, CloudQuery, CloudUser } from '../lib/ncloud';
+import { IonHeader, IonToolbar, IonTitle, IonContent, IonButton,IonIcon, ModalController, IonTextarea, IonInput, IonCard, IonCardHeader, IonCardTitle, IonThumbnail, IonCardContent, IonCardSubtitle, IonItem, IonList, IonLabel, IonAvatar, IonSelect, IonSelectOption, AlertController, IonButtons, IonProgressBar, IonText } from '@ionic/angular/standalone';
+import { CommonModule } from '@angular/common';
+import { AvatarModule, ChatPanelOptions, DalleOptions, FmodeChat, FmodeChatMessage, ImagineWork, openChatPanelModal } from 'fmode-ng';
+
 @Component({
   selector: 'app-short-generator',
   templateUrl: './short-generator.page.html',
@@ -15,6 +21,30 @@ import { CompWordEntryComponent } from '../comp-word-entry/comp-word-entry.compo
     FormsModule,
     MarkdownPreviewModule,
     CompWordEntryComponent,
+    // IonHeader,
+    // IonToolbar,
+    // IonTitle,
+    // IonContent,
+    // IonButton,
+    // IonTextarea,
+    // IonInput,
+    IonIcon,
+    IonCard,
+    IonCardHeader,
+    IonCardTitle,
+    IonCardSubtitle,
+    IonCardContent,
+    IonThumbnail,
+    IonItem,
+    IonList,
+    CommonModule,
+    IonLabel,
+    IonAvatar,
+    IonSelect,
+    IonSelectOption,
+    // IonButtons,
+    IonProgressBar,
+    IonText
   ],
 })
 export class ShortGeneratorPage implements OnInit {
@@ -27,9 +57,10 @@ export class ShortGeneratorPage implements OnInit {
   }
 
   // 用户输入提示词
-  title: string = "时空之旅";
+  titlel: string = "";
   titleInput(ev: any) {
-    this.title = ev.detail.value;
+    console.log(ev.detail.value);
+    this.titlel = ev.detail.value;
   }
 
   style: string = "玄幻";
@@ -40,11 +71,18 @@ export class ShortGeneratorPage implements OnInit {
 
   // 人物词条
   entryList: Array<any> = []
+  list: any = [];
+  entry: string = ''; 
   onEntryListChange(ev: any) {
     this.entryList = ev;
+    let list =JSON.stringify(this.entryList) ;
+    console.log(list);
+
   }
+  
   showEntryList() {
     console.log(JSON.stringify(this.entryList))
+    
   }
   // 生成的小说大纲
   generatedOutline: string = "";
@@ -60,12 +98,15 @@ export class ShortGeneratorPage implements OnInit {
 
   sendMessage() {
     console.log("create");
-
+    console.log(JSON.stringify(this.entryList));
+    console.log(this.titlel);
+    this.entry = JSON.stringify(this.entryList); // 将 entryList 转换为字符串并存储在 entry 中
+    console.log(this.entry); // 输出 entry 的值
     let PromptTemplate = `
-    您作为一名专业的${this.style}作者，请您根据用户提供的标题${this.title}，根据添加的词条${this.entryList}，给出短篇小说大纲。
+    您作为一名专业的${this.style}作者，请您根据用户提供的标题${this.titlel}，根据这个词条${this.entry}的内容，添加文章信息，并给出短篇小说大纲。
     
     `;
-
+    console.log(PromptTemplate);
     let completion = new FmodeChatCompletion([
       { role: "system", content: "" },
       { role: "user", content: PromptTemplate }
@@ -110,22 +151,36 @@ export class ShortGeneratorPage implements OnInit {
   }
 
   saveNovel() {
-    if (this.generatedContent) {
-      const novelData = {
-        title: this.title,
-        style: this.style,
-        entryList: this.entryList,
-        generatedOutline: this.generatedOutline,
-        generatedContent: this.generatedContent
-      };
-
-      // 保存到本地存储
-      localStorage.setItem('novel', JSON.stringify(novelData));
-      console.log('小说已保存到本地存储');
-
-      // 可以在这里添加其他保存逻辑，例如发送到服务器
-    } else {
-      console.log('没有生成小说内容，无法保存');
-    }
+    let consult = new CloudObject("NovelAriticle")
+    let now = new Date();
+    let dateStr = `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()}`
+    // 对象权限的精确指定
+      let completion = new FmodeChatCompletion([
+        {role:"system",content:""},
+      ])
+      
+      completion.sendCompletion().subscribe((message:any)=>{
+        // 打印消息体
+        console.log(message.content)
+        // 赋值消息内容给组件内属性
+        if (message?.complete  ) {
+         
+          
+          consult.set({
+            // name: `${this.name}`,
+            // age: `${this.age}`,
+            // gender: `${this.gender}`,
+            // desc: `${this.desc}`,
+            // user: this.currentUser.toPointer(),
+            title: `${this.titlel}`,
+            topic: `${this.style}`,
+            content2: `${this.generatedContent}`,
+            date: dateStr,
+            category: `短篇小说` 
+          });
+                  consult.save();
+                  console.log(consult);
+        }
+      })
   }
 }

novel-app/src/app/story-generator/story-generator.page.html

@@ -11,14 +11,14 @@
   <form #storyForm="ngForm" (ngSubmit)="nextStep()">
     <ion-item>
       <ion-label position="stacked">作品名称 *</ion-label>
-      <ion-textarea [(ngModel)]="title" name="title" required placeholder="请输入作品名称"></ion-textarea>
+      <ion-textarea [(ngModel)]="title" name="title" required placeholder="请输入作品名称" (ionInput)="nameInput($event)" ></ion-textarea>
       <div *ngIf="storyForm.submitted && storyForm.controls['title'].invalid" class="error">
         作品名称是必填项。
       </div>
     </ion-item>
     <ion-label position="stacked">作品简介（选填）</ion-label>
     <ion-item>
-      <ion-textarea [(ngModel)]="description" rows="5" placeholder="请输入作品简介"></ion-textarea>
+      <ion-textarea [(ngModel)]="description" name="description" rows="5" placeholder="请输入作品简介" (ionInput)="descripInput($event)" ></ion-textarea>
     </ion-item>
     <ion-button type="submit" expand="block" [disabled]="storyForm.invalid">下一步</ion-button>
   </form>

novel-app/src/app/story-generator/story-generator.page.ts

@@ -12,16 +12,22 @@ import { CommonModule } from '@angular/common';
 })
 export class StoryGeneratorPage {
   title: string = '';
+  nameInput(e:any) {
+    this.title = e.detail.value;
+  }
   description: string = '';
+  descripInput(e:any) {
+    this.description = e.detail.value;
+  }
   constructor(
     private router: Router,
   ) { }
 
   nextStep() {
-    // 处理下一步逻辑
-    console.log('Title:', this.title);
+    console.log('Title:', this.title); // 确保这里打印出正确的值
     console.log('Description:', this.description);
-    // 导航到 chapter-generator 页面
-    this.router.navigate(['/chapter-generator']);
+    this.router.navigate(['/chapter-generator'], {
+      queryParams: { title: this.title, description: this.description }
+    });
   }
 }

novel-app/src/app/tab2/tab2.page.html

@@ -19,7 +19,7 @@
             <ion-segment-button value="export" content-id="export">
               <ion-label>专家科普</ion-label>
             </ion-segment-button>
-            <ion-segment-button value="sleep" content-id="sleep">
+            <!-- <ion-segment-button value="sleep" content-id="sleep">
               <ion-label>睡眠</ion-label>
             </ion-segment-button>
             <ion-segment-button value="life" content-id="life">
@@ -30,7 +30,7 @@
             </ion-segment-button>
             <ion-segment-button value="女" content-id="female">
               <ion-label>女性</ion-label>
-            </ion-segment-button>
+            </ion-segment-button> -->
           </ion-segment>
         </ion-card-title>
       </ion-card-header>

novel-app/src/app/tab2/tab2.page.ts

@@ -90,7 +90,7 @@ setSlidePosition() {
 
 
 
-  type:"hotdot"|"export"|"sleep"|"life"|"男"|"女" = "hotdot"
+  type:"hotdot"|"export" = "hotdot"
 
   constructor(
     private modalCtrl:ModalController,
@@ -107,9 +107,11 @@ setSlidePosition() {
   }
 
   async loadCards() {
-    const query = new CloudQuery('HotDot');
-    this.allCards = await query.find(); // 执行查询并获取结果
+    const query = new CloudQuery('NovelAriticle');
+    this.allCards = await query.find(); 
+    console.log(this.allCards);
     this.cards = this.allCards.filter((card) => card.get('category').toLowerCase().includes(this.type));
+    console.log(this.cards);
   }