From 05153aa726779386b69ddde74a919debc58c17c4 Mon Sep 17 00:00:00 2001
From: cuckooent <phoben@qq.com>
Date: Wed, 4 Sep 2024 16:18:17 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E5=A4=8D=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=90=8E=E6=8A=A5=E9=94=99","MessageType":2,?=
 =?UTF-8?q?"Modules":[{"State":1,"Type":1,"Name":"PCPage/=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8"}],"Version":"v1"?=
 =?UTF-8?q?}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration               | 12 +-----------
 Pages/共用/富文本编辑器.json |  5 +++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.collaboration b/.collaboration
index 1fffd3f8..148caf6e 100644
--- a/.collaboration
+++ b/.collaboration
@@ -962,17 +962,7 @@
   },
   {
     "ModuleName": "PCPage/富文本编辑器",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-04T16:17:46.8017649+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\共用\\富文本编辑器.json",
-      "Pages\\共用\\富文本编辑器.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/素材库_列表页面",
diff --git a/Pages/共用/富文本编辑器.json b/Pages/共用/富文本编辑器.json
index 48adbf6b..c3cc1682 100644
--- a/Pages/共用/富文本编辑器.json
+++ b/Pages/共用/富文本编辑器.json
@@ -224,7 +224,8 @@
         "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
         "CommandList": [
           {
-            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+            "ClosePopupResult": 1
           }
         ],
         "ToolTip": "关闭",
@@ -324,4 +325,4 @@
       "Formula": "富文本编辑器!$B$4"
     }
   ]
-}//nfUC7yynQuFF2yf56WPwA8VZ38N/dpdWgkm+iUQiTCmgwTvaucUGlfiGLuxQ2YqzzfdKjCeHGZ8fz6jUIlLbbE7AJlGXKI1G8oRsJfeuq3iGl6PG8T/V3C7+ndQzuVMizOjYX2DK19eHVPBvBdDChT4ya97ahRco5LjOtj4W3SBnMINvSrZosvIoXhpd/k6FmCeGkNizHoUUGU2XRTbV6q/7De10aeMbDTVIvlmnD6SHS8qIL8dsof2F7Rgq50R+fvsNngRdtDdz9psXFscvqsGkxn6qjymr2qhO9XWIU6nl70ksSmf/r+maLYmNE79TeFP/ctnBnGuvMzf94sDdCmnyxuzGCf6Ccp4bu9cTfMkDSLF1AKpNIR2I07PD9KBzxRUK2fTwTeGDHL0iwB53NnL8mwDGnSI6nY6BuYkD54TGY/kSAwYK/DnY7+SAvVjykpbGdDy6vgat9lyeXvJ73ogFxRhiCp2dmASjdJMWNcKUMBYFIyXT7HSKXZQeljBuV9InoPjE6d3XGWIz9GSSvXbuboJXV5kkBpNb6W8BUArPDrt6ilpyyqUg7EW2mi5NrCvPp+GvgkhgsIzf9Ay8/puoJbocLISvsDFr6Rt6tM7QFv7JPdWtuOPOX92yA585xGNHnGtmPhmx8L7cWNI8OYqbS1CupiJxCTcFARZkAsiV+tO7LX4jx6wK0FkGz0P4WT4hA236MHKVHk7hfUc2WupkqszMivWW+dXGcuR2swJIWIVl99Waud+Wcu6Gws7EyWD/KvQo8b3mU7Dib/zApANHRJrgZOEtD7yOkgCOjuSHVE2Cfr1dR+GChhH95E6g8zr83P+pC2O78cGhrKJfpzw+4E6NNL21PID64cudqqWsLrbh5QaiTRuhN+28nwXfpttt2Takm1cxeiA7YWob2g==|920
\ No newline at end of file
+}//qCkaQ3tl6h2UHxv6pmOTsHUpASot5dYaw5QscKabaIGt72yU4MyQNgCR8sAjCvZAMq3ZezicrnxqHJpPA7bu2v7KJz+kl2mBZnDIfLZbtkDLu3qRS8eDOiaKO8ihUrs40dUTkeW8T6ZprIuKbx/z/5KcY9rH4llNatebEwfGA1zOyrwfcE1VYL2H8Gj6hRLMJJeTfeHI4g6HAB8e8sMqONdCSGa2l9AsulOBzu3R3h4DL/vqfzFArB3TXNG+FYw9UyAK8KzjPPx3cSkBy/kEiyCxaFjv/Yq45Y6a6iMjB1WbKDRIKTwYxeL7+TPWFDBy2GKd7zJk6csq2hmtUPdaPlRl3xzbIkYW1BpYut7y3Ms4/HkHy/L19Y0c1JfrRH9qpXIPKiYvo8wsRWinULOcShAxVlkh2c8KHHNXZw9WJXdi5K9VYpeWenfgEQY/dN0kqjcW2uRe1x32ul6GNkUyE+bS4UT/ZUUUzMNkNYxy9thu5LsXUg8YlBPTEC5vIMRK00XRHnnknfFdWtE9YoogprjT/jLuKiuLBqvqVLqFVMGkz/qQaijM0MzL5n0yHu9ZiwdBpXilHqTh24RPWsqCTfrqmuvT9QXY4rWWqx+J0aht5fgEcnlrgkoMFL+zOa7ir82lWo6uGwDHwvOh5sAowZYtqJwK1UEj/6IwSluxiKLldlyga0WYpUKStXH87UQWmRh/cgD191OG2/677HVQ5foGaqIvMa9i+r6cHQ0u6oDiJ/FyRcSE0IDEjVOy99SJhNKkHqP4i9eft9h/8ADOKxj12w9peM1wbLiZCH0uMpn+13biLDx3HNs0EPWOQ6SaFRDg3Yj1aFjttZAR4gmVxiq6RDuTbayQEInfCbLWJl3Tx/+0Z8J0WBzND3kb8EfcSK4VuvScklRXhC1psiYOzA==|920
\ No newline at end of file