mirror of
https://github.com/Karaka-Management/oms-Editor.git
synced 2026-02-18 02:58:41 +00:00
update
This commit is contained in:
parent
6f4d839a3c
commit
7b9d28d1b3
|
|
@ -4,6 +4,10 @@ import { Editor } from './Models/Editor.js';
|
|||
|
||||
Autoloader.defineNamespace('omsApp.Modules');
|
||||
|
||||
/**
|
||||
* @feature Create immediate text preview similar to a rich text editor or Typora
|
||||
* https://github.com/Karaka-Management/oms-Editor/issues/4
|
||||
*/
|
||||
omsApp.Modules.Editor = class {
|
||||
constructor(app)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -126,8 +126,10 @@ final class ApiController extends Controller
|
|||
/** @var \Modules\Admin\Models\Account $account */
|
||||
$account = AccountMapper::get()->where('id', $request->header->account)->execute();
|
||||
|
||||
$collection = null;
|
||||
|
||||
if (!empty($uploadedFiles = $request->files)) {
|
||||
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
|
||||
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
|
||||
[],
|
||||
[],
|
||||
$uploadedFiles,
|
||||
|
|
@ -136,20 +138,17 @@ final class ApiController extends Controller
|
|||
$path,
|
||||
);
|
||||
|
||||
$collection = null;
|
||||
foreach ($uploaded as $media) {
|
||||
$accountPath = '/Accounts/' . $account->id . ' ' . $account->login
|
||||
. '/Editor/'
|
||||
. $doc->createdAt->format('Y/m')
|
||||
. '/' . $doc->id;
|
||||
|
||||
if ($collection === null) {
|
||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||
$accountPath,
|
||||
$request->header->account,
|
||||
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Editor/' . $doc->createdAt->format('Y/m') . '/' . $doc->id
|
||||
);
|
||||
}
|
||||
|
||||
$this->createModelRelation(
|
||||
$request->header->account,
|
||||
|
|
@ -181,16 +180,13 @@ final class ApiController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
if (!empty($mediaFiles = $request->getDataJson('media'))) {
|
||||
$collection = null;
|
||||
$mediaFiles = $request->getDataJson('media');
|
||||
foreach ($mediaFiles as $media) {
|
||||
if ($collection === null) {
|
||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||
$path,
|
||||
$request->header->account,
|
||||
__DIR__ . '/../../../Modules/Media/Files' . $path
|
||||
);
|
||||
}
|
||||
|
||||
$this->createModelRelation(
|
||||
$request->header->account,
|
||||
|
|
@ -222,7 +218,6 @@ final class ApiController extends Controller
|
|||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create media directory path
|
||||
|
|
@ -408,7 +403,7 @@ final class ApiController extends Controller
|
|||
return;
|
||||
}
|
||||
|
||||
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
|
||||
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
|
||||
names: $request->getDataList('names'),
|
||||
fileNames: $request->getDataList('filenames'),
|
||||
files: $uploadedFiles,
|
||||
|
|
|
|||
7
Models/Elastic/EditorDoc.json
Normal file
7
Models/Elastic/EditorDoc.json
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"id": "{id}",
|
||||
"title": "{title}",
|
||||
"content": "{content}",
|
||||
"language": "{language}",
|
||||
"tags": ["{tags}"]
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user