@steedos/webapp 3.0.0-beta.147 → 3.0.0-beta.149

package/dist/assets/{index-DocElR8O.js → index-iGJF1vvD.js}

@@ -56192,47 +56192,19 @@ Try polyfilling it using "@formatjs/intl-displaynames"
       console.error(e.message + "\\r\\n" + e.stack);
     }
   `;
-  const convertAppVisibleOnScript = `
-    var currentAmis = amisRequire('amis');
-    app_items.forEach((item) => {
-      let visible_on = item.visible_on && item.visible_on.trim();
-      if(visible_on){
-        // amis visibleOn属性中的表达式来自作用域中变量时,amis不认,所以这里把公式表达式提前运行下
-        try{
-          visible_on = currentAmis.evaluate(visible_on, BuilderAmisObject.AmisLib.createObject(context, item));
-          item.visible_on = visible_on;
-        }
-        catch(ex){
-          console.error("运行应用“" + item.name + "”的显示公式表达式时出现错误:",ex);
-          item.visible_on = false;
-        }
-      }
-      else{
-        item.visible_on = true;
-      }
-    });
-  `;
-  const pcInitApiAdaptorScript = `
+  const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) => {
     let app_items = payload;
-    let object_items = [];
-    let objects = [];
-    app_items.forEach((item) => {
-      item.children.forEach((i) => {
-        if (objects.indexOf(i.id) < 0) {
-          objects.push(i.id);
-          if(i.type != 'url' && i.type != 'page'){object_items.push(i);}
+    if (app_items && app_items.length > 0) {
+      let firstApp = app_items[0];
+      if (firstApp && firstApp.children && firstApp.children.length > 0) {
+        let firstTab = firstApp.children[0];
+        if (firstTab) {
+          window.location.href = firstTab.path;
         }
-      })
-    })
-    ${convertAppVisibleOnScript}
-    
-    payload = {
-      app_items,
-      object_items
+      }
     }
-
     return payload;
-  `;
+  };
   const AppDashboard = () => {
     const isMobile = false;
     const badgeText = "${IF(${id} == 'approve_workflow',${badge|pick:'workflow'},${badge|pick:${id}}) | toInt}";
@@ -56458,7 +56430,8 @@ Try polyfilling it using "@formatjs/intl-displaynames"
         "headers": {
           "Authorization": "Bearer ${context.tenantId},${context.authToken}"
         },
-        "adaptor": pcInitApiAdaptorScript
+        // "adaptor": pcInitApiAdaptorScript
+        adaptor: pcInitJumtoFirstAppFirstTabScript
       },
       data: {
         objectName: "",
@@ -59355,12 +59328,15 @@ Try polyfilling it using "@formatjs/intl-displaynames"
     const uiSchema = window.getUISchemaSync(objectName);
     const [searchParams] = useSearchParams();
     const allParams = Object.fromEntries(searchParams.entries());
-    console.log(`ObjectListView`, appId, objectName, listName, location2, allParams);
     if (!listName) {
       listName = lodashExports.first(lodashExports.values(uiSchema.list_views))?.name;
     }
     if (Steedos.Page.getDisplay(objectName) === "split") {
-      window.navigate(`/app/${appId}/${objectName}/view/none?side_object=${objectName}&side_listview_id=${listName}&additionalFilters=`);
+      const navigate = useNavigate();
+      setTimeout(() => {
+        navigate(`/app/${appId}/${objectName}/view/none?side_object=${objectName}&side_listview_id=${listName}&additionalFilters=`);
+      }, 1);
+      return;
     }
     return /* @__PURE__ */ jsxRuntimeExports.jsx(AmisRender, { schema: {
       type: "page",
@@ -59406,6 +59382,13 @@ Try polyfilling it using "@formatjs/intl-displaynames"
     let location2 = useLocation();
     const urlParams = new URLSearchParams(location2.search);
     const sideListViewId = urlParams.get("side_listview_id");
+    if (recordId === "none" && Steedos.Page.getDisplay(objectName) === "grid") {
+      const navigate = useNavigate();
+      setTimeout(() => {
+        navigate(`/app/${appId}/${objectName}/grid/${sideListViewId}?display=grid`);
+      }, 1);
+      return;
+    }
     return /* @__PURE__ */ jsxRuntimeExports.jsx(AmisRender, { schema: {
       type: "page",
       bodyClassName: "p-0 overflow-hidden",

package/dist/index.html

@@ -63,7 +63,7 @@
 
     </script>
     <link rel="stylesheet" type="text/css" href="/tailwind/tailwind-steedos.css">
-    <script type="module" crossorigin src="/assets/index-DocElR8O.js"></script>
+    <script type="module" crossorigin src="/assets/index-iGJF1vvD.js"></script>
   </head>
   <body class="skin-blue-light fixed steedos sidebar-mini three-columns" >
     <div id="root" class="steedos skin-blue-light creator h-full flex flex-col relative overflow-hidden bg-slate-50"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/webapp",
-  "version": "3.0.0-beta.147",
+  "version": "3.0.0-beta.149",
   "files": [
     "dist"
   ],
@@ -75,5 +75,5 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "ac466efea47ee57333d1dfa6393a3d84aed9a305"
+  "gitHead": "33fef020c5505c9f122d705ae36d373c716cf822"
 }