Commit 680c7a07 authored by 李文起's avatar 李文起
Browse files

Merge branch 'hotfix/v1.3.3.3' into 'master'

富文本更改

See merge request !140
Showing with 4 additions and 4 deletions
+4 -4
......@@ -15,9 +15,9 @@ class RichText extends Model
/**
* 处理表情
*/
public function setContentAttribute($value){
/*public function setContentAttribute($value){
return $this->attributes['content'] = Emoji::encode($value);
}
}*/
public function getContentAttribute(){
return Emoji::decode($this->attributes['content']);
......
......@@ -16,7 +16,7 @@ class RichTextHotspot extends HotspotAction
if ( !empty($this->data['actionData']['htmlContent'])) {
$htmlContent = $this->data['actionData']['htmlContent'];
$htmlContent = Emoji::encode($this->data['actionData']['htmlContent']);
unset($this->data['actionData']['htmlContent']);
} else {
......@@ -26,7 +26,7 @@ class RichTextHotspot extends HotspotAction
$richTextInterface = resolve('Yjtec\PanoEdit\Repositories\Contracts\RichTextInterface');
if (!empty($this->data['actionData']['richTextId'])) {
$richTextInterface->update(['id'=>$this->data['actionData']['richTextId']],['uuid'=>$this->data['actionData']['id'],'content'=>$htmlContent]);
$richTextInterface->update(['id'=>$this->data['actionData']['richTextId']],['uuid'=>$this->data['actionData']['uuid'],'content'=>$htmlContent]);
} else {
$richText = $richTextInterface->index(['uuid'=>$this->data['actionData']['uuid']]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment