From 23c38fcfc9e844772a37a5c7da15a8560b6f77cc Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Wed, 18 May 2022 12:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BAvip=E5=BA=94=E7=94=A8=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit bae3c58b2c450db317d75ec4654cad3d5ff08fc5)
---
 .../x_component_appstore/src/components/Category.vue     | 5 +++--
 .../x_component_appstore/src/components/Content.vue      | 2 +-
 o2web/source/x_desktop/js/initialServiceScriptText.js    | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/o2web/source/x_component_appstore/src/components/Category.vue b/o2web/source/x_component_appstore/src/components/Category.vue
index 2a7f2e04d3..6146fd402f 100644
--- a/o2web/source/x_component_appstore/src/components/Category.vue
+++ b/o2web/source/x_component_appstore/src/components/Category.vue
@@ -52,6 +52,7 @@ export default {
   text-align: center;
   display: flex;
   justify-content: center;
+  word-break: keep-all;
 }
 .category-item{
   height: 40px;
@@ -69,7 +70,7 @@ export default {
 }
 .search-area{
   height: 32px;
-  width: 268px;
+  min-width: 228px;
   border-radius: 20px;
   border: 1px solid #999999;
   margin: 5px 0 0 20px;
@@ -78,7 +79,7 @@ export default {
   height: 30px;
   border: 0;
   background: transparent;
-  width: 180px;
+  min-width: 100px;
 }
 .category-search-icon{
   height: 32px;
diff --git a/o2web/source/x_component_appstore/src/components/Content.vue b/o2web/source/x_component_appstore/src/components/Content.vue
index 6d5cbdf772..b6bccabc13 100644
--- a/o2web/source/x_component_appstore/src/components/Content.vue
+++ b/o2web/source/x_component_appstore/src/components/Content.vue
@@ -8,7 +8,7 @@
         <Category/>
       </div>
       <div class="applications-content">
-        <Applications ref="applications" isVip="isVip"/>
+        <Applications ref="applications" :isVip="isVip"/>
       </div>
     </div>
     <div v-else-if="isAdmin" class="appstore-content">
diff --git a/o2web/source/x_desktop/js/initialServiceScriptText.js b/o2web/source/x_desktop/js/initialServiceScriptText.js
index 1d6af3dbd7..7802b665fd 100644
--- a/o2web/source/x_desktop/js/initialServiceScriptText.js
+++ b/o2web/source/x_desktop/js/initialServiceScriptText.js
@@ -1133,7 +1133,10 @@ library.defineProperties(response, {
 });
 
 
-
+function _get(key, java_data){
+    if (!bind["o"+key]) bind["o"+key] = JSON.parse(java_data);
+    return bind["o"+key];
+}
 
 var o= {
     "entityManager": { "configurable": true, "get": function(){return null;} },
@@ -1187,7 +1190,7 @@ var o= {
      * var startTime = (new Date(this.parameters.startTime)).format("db");  //格式化为yyyy-mm-dd hh:mm:ss
      * return "SELECT o FROM Task o WHERE o.person='"+user+"' AND o.startTime>{ts '"+startTime+"'}"
      */
-    "parameters": { "configurable": true, "get": function(){return ((bind.java_parameters) ? JSON.parse(bind.java_parameters) : null)} },
+    "parameters": { "configurable": true, "get": function(){return ((bind.java_parameters) ? _get("parameters", bind.java_parameters) : null)} },
     /**
      * 调用接口时传入的请求消息体的文本内容。
      * @o2range 服务管理-接口
@@ -1205,7 +1208,7 @@ var o= {
     "request": { "configurable": true, "get": function(){return bind.java_request || null; } },
     "resources": { "configurable": true, "get": function(){return (bind.java_resources || null)} },
     "customResponse": { "configurable": true, "get": function(){return (bind.java_customResponse || null)} },
-    "message": { "configurable": true, "get": function(){return (bind.java_message) ? JSON.parse(bind.java_message) : null;} }
+    "message": { "configurable": true, "get": function(){return (bind.java_message) ? _get("message", bind.java_message) : null;} }
 
 }
 library.defineProperties(bind, o);
-- 
GitLab