Merge branch release/21.7.8 of zentao/zentaopms (#13101)

lib/zin/wg/editor/v1.php

@@ -24,7 +24,7 @@ class editor extends wg
         'locale?: string',                      // 语言，可选值 'zh', 'en'，默认跟随浏览器，也可以是自定义的语言项 JSON，详见 ZenEditor 文档
         'markdown?: bool=false',                // 是否启用 Markdown 模式，若启用，为了兼容性将会隐藏一些功能
         'neglectDefaultTextStyle?: bool=false', // 是否不赋予默认的文本样式
-        'preferHardBreak?: bool=false',         // 是否优先使用硬回车而不是新段落
+        'preferHardBreak?: bool=true',          // 是否优先使用硬回车而不是新段落
         'value?: string',                       // 初始内容
         'templateType?: string',                // 模板类型
         'uid?: string'                          // 图片上传 uid

www/js/zui3/zen-editor/index.esm.js

@@ -1 +1 @@
-export{M as MonacoEditor,Z as ZenEditor}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+export{M as MonacoEditor,Z as ZenEditor}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";

www/js/zui3/zen-editor/p-115adbf1.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-40b386e0.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-521a7310.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-5bec25d4.js

@@ -1,4 +1,4 @@
-import{t,m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{t,m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-62b8f6df.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-66a49f35.js

@@ -1,4 +1,4 @@
-import{m as t}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as t}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-86362c89.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-8c938220.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-b3d73edf.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-ba29c666.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-c64dc386.js

@@ -1,4 +1,4 @@
-import{m as e}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as e}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-c6875436.js

@@ -1,4 +1,4 @@
-import{m as t}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as t}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-d91b3fcf.js

@@ -1,4 +1,4 @@
-import{conf as e,language as t}from"./p-831ce65f.js";import"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{conf as e,language as t}from"./p-115adbf1.js";import"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/p-e25d3abd.js

@@ -1,4 +1,4 @@
-import{m as t}from"./p-c01502dc.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
+import{m as t}from"./p-4196c3f1.js";import"./p-7900c24a.js";import"./p-986e5fe7.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)

www/js/zui3/zen-editor/zen-editor.esm.js

@@ -1 +1 @@
-import{p as e,b as o}from"./p-7900c24a.js";export{s as setNonce}from"./p-7900c24a.js";import{g as r}from"./p-c53e41a7.js";(()=>{const o=import.meta.url,r={};return""!==o&&(r.resourcesUrl=new URL(".",o).href),e(r)})().then((async e=>(await r(),o([["p-f18a426a",[[65,"zen-editor",{name:[1],readonly:[1028],uploadUrl:[1,"upload-url"],placeholder:[1],fullscreenable:[4],resizable:[4],exposeEditor:[4,"expose-editor"],size:[1],hideUI:[4,"hide-ui"],hideMenubar:[4,"hide-menubar"],menubarMode:[1,"menubar-mode"],slashMenu:[4,"slash-menu"],bubbleMenu:[4,"bubble-menu"],preferHardBreak:[4,"prefer-hard-break"],neglectDefaultTextStyle:[4,"neglect-default-text-style"],markdown:[4],initialContent:[1,"initial-content"],locale:[1],css:[1],collaborative:[4],hocuspocus:[1],docName:[1,"doc-name"],username:[1],userColor:[1,"user-color"],value:[1025],cssSrc:[1,"css-src"],coreClass:[1,"core-class"],contentClass:[1,"content-class"],proseClass:[1,"prose-class"],editor:[32],isFullscreen:[32],rendered:[32],setHTML:[64],insertHTML:[64],getHTML:[64],getText:[64],focusEditor:[64],blurEditor:[64],setReadonly:[64]},null,{cssSrc:["onCssSrcChange"],css:["onCSSChange"]}],[1,"zen-editor-core",{name:[1],readonly:[4],uploadUrl:[1,"upload-url"],placeholder:[1],initialContent:[1,"initial-content"],resizable:[4],exposeEditor:[4,"expose-editor"],size:[1],hideUI:[4,"hide-ui"],hideMenubar:[4,"hide-menubar"],menubarMode:[1,"menubar-mode"],extraMenubarItems:[1,"extra-menubar-items"],slashMenu:[4,"slash-menu"],bubbleMenu:[4,"bubble-menu"],preferHardBreak:[4,"prefer-hard-break"],neglectDefaultTextStyle:[4,"neglect-default-text-style"],markdown:[4],locale:[1],styles:[16],cssSrc:[1,"css-src"],contentClass:[1,"content-class"],proseClass:[1,"prose-class"],collaborative:[4],hocuspocus:[1],docName:[1,"doc-name"],username:[1],userColor:[1,"user-color"],updateInputValue:[16],fullscreenable:[4],toggleFullscreen:[16],isFullscreen:[4,"is-fullscreen"],value:[1],editor:[32],forceUpdateCounter:[32],isMonaco:[32]},null,{locale:["onLocaleChanage"],cssSrc:["onCssSrcChange"]}],[0,"zen-editor-content",{editor:[16],styles:[16],bubbleMenu:[4,"bubble-menu"],proseClass:[1,"prose-class"]},[[2,"click","handleClick"]]],[0,"zen-editor-menubar",{editor:[16],menubarMode:[2,"menubar-mode"],uploadDisabled:[4,"upload-disabled"],extraMenubarItems:[1,"extra-menubar-items"],forceUpdateCounter:[2,"force-update-counter"],states:[8],toggleMonaco:[16],toggleFullscreen:[16],styles:[16]}],[0,"monaco-editor",{options:[8],initialValue:[1,"initial-value"],tiptapEditor:[16],updateInputValue:[16],setFocus:[64],getValue:[64]},null,{options:["onOptionsChange"]}],[2,"zen-editor-bubble-menu",{menuProps:[16],editor:[16],disabled:[4],element:[32]}],[0,"zen-editor-menu-item",{itemProps:[8,"item-props"],menubarMode:[2,"menubar-mode"],styles:[16]}]]],["p-d22ddfa9",[[0,"zen-editor-floating-menu",{menuProps:[16],editor:[16],element:[32]}]]],["p-ad0a1235",[[1,"zen-editor-slash-menu",{editor:[16],items:[1040],props:[16],currentSelectionIndex:[32]},null,{editor:["onEditorChange"],items:["onItemsChange"],props:["onPropsChange"]}]]],["p-795d6f9f",[[0,"zen-editor-footer",{editor:[16],forceUpdateCounter:[2,"force-update-counter"],toggleFullscreen:[16],showCharCount:[4,"show-char-count"]}]]]],e))));
+import{p as e,b as o}from"./p-7900c24a.js";export{s as setNonce}from"./p-7900c24a.js";import{g as r}from"./p-c53e41a7.js";(()=>{const o=import.meta.url,r={};return""!==o&&(r.resourcesUrl=new URL(".",o).href),e(r)})().then((async e=>(await r(),o([["p-1d846237",[[65,"zen-editor",{name:[1],readonly:[1028],uploadUrl:[1,"upload-url"],placeholder:[1],fullscreenable:[4],resizable:[4],exposeEditor:[4,"expose-editor"],size:[1],hideUI:[4,"hide-ui"],hideMenubar:[4,"hide-menubar"],menubarMode:[1,"menubar-mode"],slashMenu:[4,"slash-menu"],bubbleMenu:[4,"bubble-menu"],preferHardBreak:[4,"prefer-hard-break"],neglectDefaultTextStyle:[4,"neglect-default-text-style"],markdown:[4],initialContent:[1,"initial-content"],locale:[1],css:[1],collaborative:[4],hocuspocus:[1],docName:[1,"doc-name"],username:[1],userColor:[1,"user-color"],value:[1025],cssSrc:[1,"css-src"],coreClass:[1,"core-class"],contentClass:[1,"content-class"],proseClass:[1,"prose-class"],editor:[32],isFullscreen:[32],rendered:[32],setHTML:[64],insertHTML:[64],getHTML:[64],getText:[64],focusEditor:[64],blurEditor:[64],setReadonly:[64]},null,{cssSrc:["onCssSrcChange"],css:["onCSSChange"]}],[1,"zen-editor-core",{name:[1],readonly:[4],uploadUrl:[1,"upload-url"],placeholder:[1],initialContent:[1,"initial-content"],resizable:[4],exposeEditor:[4,"expose-editor"],size:[1],hideUI:[4,"hide-ui"],hideMenubar:[4,"hide-menubar"],menubarMode:[1,"menubar-mode"],extraMenubarItems:[1,"extra-menubar-items"],slashMenu:[4,"slash-menu"],bubbleMenu:[4,"bubble-menu"],preferHardBreak:[4,"prefer-hard-break"],neglectDefaultTextStyle:[4,"neglect-default-text-style"],markdown:[4],locale:[1],styles:[16],cssSrc:[1,"css-src"],contentClass:[1,"content-class"],proseClass:[1,"prose-class"],collaborative:[4],hocuspocus:[1],docName:[1,"doc-name"],username:[1],userColor:[1,"user-color"],updateInputValue:[16],fullscreenable:[4],toggleFullscreen:[16],isFullscreen:[4,"is-fullscreen"],value:[1],editor:[32],forceUpdateCounter:[32],isMonaco:[32]},null,{locale:["onLocaleChanage"],cssSrc:["onCssSrcChange"]}],[0,"zen-editor-content",{editor:[16],styles:[16],bubbleMenu:[4,"bubble-menu"],proseClass:[1,"prose-class"]},[[2,"click","handleClick"]]],[0,"zen-editor-menubar",{editor:[16],menubarMode:[2,"menubar-mode"],uploadDisabled:[4,"upload-disabled"],extraMenubarItems:[1,"extra-menubar-items"],forceUpdateCounter:[2,"force-update-counter"],states:[8],toggleMonaco:[16],toggleFullscreen:[16],styles:[16]}],[0,"monaco-editor",{options:[8],initialValue:[1,"initial-value"],tiptapEditor:[16],updateInputValue:[16],setFocus:[64],getValue:[64]},null,{options:["onOptionsChange"]}],[2,"zen-editor-bubble-menu",{menuProps:[16],editor:[16],disabled:[4],element:[32]}],[0,"zen-editor-menu-item",{itemProps:[8,"item-props"],menubarMode:[2,"menubar-mode"],styles:[16]}]]],["p-d22ddfa9",[[0,"zen-editor-floating-menu",{menuProps:[16],editor:[16],element:[32]}]]],["p-ad0a1235",[[1,"zen-editor-slash-menu",{editor:[16],items:[1040],props:[16],currentSelectionIndex:[32]},null,{editor:["onEditorChange"],items:["onItemsChange"],props:["onPropsChange"]}]]],["p-795d6f9f",[[0,"zen-editor-footer",{editor:[16],forceUpdateCounter:[2,"force-update-counter"],toggleFullscreen:[16],showCharCount:[4,"show-char-count"]}]]]],e))));