@steedos/service-plugin-amis 3.0.0-beta.2 → 3.0.0-beta.21

package/main/default/client/amis.render.client.js

@@ -39,7 +39,7 @@
     };
 
     const getAmisLng = ()=>{
-        var locale = Creator.USER_CONTEXT ? Creator.USER_CONTEXT.user.language : null;
+        var locale = Builder.settings.context.user ? Builder.settings.context.user.language : null;
         if(locale){
             locale = locale.replace('_', '-');
             locale = locale === 'en' ? 'en-US' : locale;

package/main/default/client/{creator.function.client.js → steedos.function.client.js}

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-20 17:42:20
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-22 22:36:38
+ * @LastEditTime: 2025-03-05 11:30:22
  * @Description: 提供辅助函数
  */
 (function(){
@@ -73,7 +73,7 @@
         }
       }
 
-    Creator.showListFilter = (objectName, listView, data, props)=>{
+    Steedos.showListFilter = (objectName, listView, data, props)=>{
         const pageName = `${objectName}-list-filter`;
         const canSave = canSaveFilters();
         return Steedos.Page.render(SteedosUI.Drawer, {

package/main/default/services/utils/fields/index.js

@@ -193,7 +193,7 @@ function  convertSFieldToAmisFilesField(field,readonly){
         type: getAmisStaticFieldType(fieldType, readonly),
         receiver: {
             method: "post",
-            url: `\${context.rootUrl}/s3/${table_name}`,
+            url: `/api/v6/files/${table_name}`,
             adaptor: `
 var rootUrl = ${JSON.stringify(rootUrl)};
 payload = {

package/main/default/services/utils/object-record.js

@@ -160,7 +160,7 @@ function getScriptForRewriteValueForFileFields(fields){
                                     return {
                                         value: value,
                                         name: fileFieldNames[index],
-                                        url: fileRootUrl + value + "?download=true",
+                                        url: fileRootUrl + value,
                                         state: "uploaded"
                                     }
                                 });
@@ -169,7 +169,7 @@ function getScriptForRewriteValueForFileFields(fields){
                             data[item] = {
                                 value: fileFieldValue,
                                 name: fileFieldNames[0],
-                                url: fileRootUrl + fileFieldValue + "?download=true",
+                                url: fileRootUrl + fileFieldValue,
                                 state: "uploaded"
                             };
                         }

package/main/default/services/utils/util.js

@@ -9,7 +9,7 @@ function getSvgUrl(source, name) {
       name = foo[1];
     }
     url = "/assets/icons/" + source + "/svg/symbols.svg#" + name;
-    return Creator.getRelativeUrl(url);
+    return Steedos.getRelativeUrl(url);
 }
 
 exports.getSvgUrl = getSvgUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.21",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74",
+  "gitHead": "32e9995fdf155892ba258a4b1e69fdae12f5dbed",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-02 15:05:31
+ * @LastEditTime: 2025-03-10 11:59:01
  * @Description: 
  */
 "use strict";
@@ -49,16 +49,7 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-		"steedos-server.started": {
-            async handler() {
-                await this.publicClientJS();
-            }
-        },
-        "space.initialized": {
-            async handler() {
-                await this.publicClientJS();
-            }
-        }
+		
 	},
 
 	/**
@@ -74,10 +65,11 @@ module.exports = {
 				const { path : packagePath } = packageInfo;
                 let publicPath = path.join(packagePath, 'main', 'default', 'client');
                 try {
-                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS || typeof WebApp == 'undefined') {
+                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS) {
                         return;
                     }
                 } catch (error) {
+					console.log('error', error)
                     return
                 }
 
@@ -87,12 +79,11 @@ module.exports = {
                     try {
                         const router = require('@steedos/router').staticRouter();
                         let routerPath = "";
-                        if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
-                            routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+                        if (process.env.ROOT_URL_PATH_PREFIX) {
+                            routerPath = process.env.ROOT_URL_PATH_PREFIX;
                         }
                         const cacheTime = 86400000 * 1; // one day
                         router.use(`${routerPath}/amis-pages/js`, express.static(publicPath, { maxAge: cacheTime }));
-                        // WebApp.connectHandlers.use(router);
                     } catch (error) {
                         console.error(error)
                         this.settings.loadedPublicClientJS = false;
@@ -115,9 +106,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		this.broker.waitForServices("steedos-server").then(async () => {
-			await this.publicClientJS()
-		});
+		await this.publicClientJS()
 	},
 
 	/**

package/public/tailwind/tailwind-steedos.css

@@ -56,10 +56,6 @@
   position: static !important
 }
 
-.fixed {
-  position: fixed
-}
-
 .absolute {
   position: absolute
 }
@@ -68,17 +64,6 @@
   position: sticky
 }
 
-.inset-0 {
-  top: 0px;
-  right: 0px;
-  bottom: 0px;
-  left: 0px
-}
-
-.z-20 {
-  z-index: 20
-}
-
 .col-span-2 {
   grid-column: span 2 / span 2
 }
@@ -87,25 +72,20 @@
   float: right
 }
 
-.m-1 {
-  margin: 0.25rem
-}
-
 .m-0 {
   margin: 0px
 }
 
-.-m-8 {
-  margin: -2rem
-}
-
 .m-auto {
   margin: auto
 }
 
-.mx-4 {
-  margin-left: 1rem;
-  margin-right: 1rem
+.m-4 {
+  margin: 1rem
+}
+
+.m-1 {
+  margin: 0.25rem
 }
 
 .my-2 {
@@ -113,19 +93,31 @@
   margin-bottom: 0.5rem
 }
 
-.-mx-11 {
-  margin-left: -2.75rem;
-  margin-right: -2.75rem
+.mx-4 {
+  margin-left: 1rem;
+  margin-right: 1rem
 }
 
-.mt-3 {
-  margin-top: 0.75rem
+.mb-0 {
+  margin-bottom: 0px
+}
+
+.ml-2 {
+  margin-left: 0.5rem
 }
 
 .mb-4 {
   margin-bottom: 1rem
 }
 
+.mr-7 {
+  margin-right: 1.75rem
+}
+
+.mt-3 {
+  margin-top: 0.75rem
+}
+
 .mt-2 {
   margin-top: 0.5rem
 }
@@ -142,18 +134,6 @@
   margin-top: -0.75rem
 }
 
-.mr-7 {
-  margin-right: 1.75rem
-}
-
-.mb-0 {
-  margin-bottom: 0px
-}
-
-.ml-2 {
-  margin-left: 0.5rem
-}
-
 .block {
   display: block
 }
@@ -186,34 +166,22 @@
   display: none
 }
 
-.h-9 {
-  height: 2.25rem
-}
-
 .h-full {
   height: 100%
 }
 
-.h-0 {
-  height: 0px
-}
-
 .h-7 {
   height: 1.75rem
 }
 
-.w-9 {
-  width: 2.25rem
+.h-9 {
+  height: 2.25rem
 }
 
 .w-full {
   width: 100%
 }
 
-.w-6\/12 {
-  width: 50%
-}
-
 .w-4\/5 {
   width: 80%
 }
@@ -222,8 +190,8 @@
   width: 24rem
 }
 
-.min-w-\[240px\] {
-  min-width: 240px
+.w-9 {
+  width: 2.25rem
 }
 
 .min-w-\[200px\] {
@@ -246,23 +214,10 @@
   flex-grow: 1
 }
 
-.-translate-x-0 {
-  --tw-translate-x: -0px;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))
-}
-
 .transform {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))
 }
 
-.flex-row {
-  flex-direction: row
-}
-
-.flex-col {
-  flex-direction: column
-}
-
 .items-center {
   align-items: center
 }
@@ -283,18 +238,10 @@
   overflow: hidden
 }
 
-.overflow-x-auto {
-  overflow-x: auto
-}
-
 .overflow-y-auto {
   overflow-y: auto
 }
 
-.whitespace-nowrap {
-  white-space: nowrap
-}
-
 .rounded {
   border-radius: 0.25rem
 }
@@ -316,17 +263,12 @@
   border-bottom-width: 1px
 }
 
-.border-r {
-  border-right-width: 1px
-}
-
 .border-b {
   border-bottom-width: 1px
 }
 
-.border-gray-300 {
-  --tw-border-opacity: 1;
-  border-color: rgb(209 213 219 / var(--tw-border-opacity))
+.border-r {
+  border-right-width: 1px
 }
 
 .border-gray-200 {
@@ -334,33 +276,38 @@
   border-color: rgb(229 231 235 / var(--tw-border-opacity))
 }
 
+.border-gray-300 {
+  --tw-border-opacity: 1;
+  border-color: rgb(209 213 219 / var(--tw-border-opacity))
+}
+
 .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity))
 }
 
-.bg-gray-50 {
+.bg-gray-100 {
   --tw-bg-opacity: 1;
-  background-color: rgb(249 250 251 / var(--tw-bg-opacity))
+  background-color: rgb(243 244 246 / var(--tw-bg-opacity))
 }
 
-.bg-gray-100 {
+.bg-gray-50 {
   --tw-bg-opacity: 1;
-  background-color: rgb(243 244 246 / var(--tw-bg-opacity))
+  background-color: rgb(249 250 251 / var(--tw-bg-opacity))
 }
 
 .bg-none {
   background-image: none
 }
 
-.p-0 {
-  padding: 0px
-}
-
 .p-4 {
   padding: 1rem
 }
 
+.p-0 {
+  padding: 0px
+}
+
 .p-2 {
   padding: 0.5rem
 }
@@ -369,6 +316,21 @@
   padding: 0.25rem
 }
 
+.py-1 {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem
+}
+
+.px-0 {
+  padding-left: 0px;
+  padding-right: 0px
+}
+
+.py-4 {
+  padding-top: 1rem;
+  padding-bottom: 1rem
+}
+
 .px-2 {
   padding-left: 0.5rem;
   padding-right: 0.5rem
@@ -394,29 +356,14 @@
   padding-bottom: 0.5rem
 }
 
-.px-0 {
-  padding-left: 0px;
-  padding-right: 0px
-}
-
-.py-1 {
-  padding-top: 0.25rem;
-  padding-bottom: 0.25rem
-}
-
-.py-4 {
-  padding-top: 1rem;
-  padding-bottom: 1rem
+.pt-4 {
+  padding-top: 1rem
 }
 
 .pl-10 {
   padding-left: 2.5rem
 }
 
-.pt-4 {
-  padding-top: 1rem
-}
-
 .text-left {
   text-align: left
 }
@@ -433,22 +380,18 @@
   font-weight: 700
 }
 
-.italic {
-  font-style: italic
-}
-
 .leading-none {
   line-height: 1
 }
 
-.text-gray-600 {
+.text-black {
   --tw-text-opacity: 1;
-  color: rgb(75 85 99 / var(--tw-text-opacity))
+  color: rgb(0 0 0 / var(--tw-text-opacity))
 }
 
-.text-black {
+.text-gray-300 {
   --tw-text-opacity: 1;
-  color: rgb(0 0 0 / var(--tw-text-opacity))
+  color: rgb(209 213 219 / var(--tw-text-opacity))
 }
 
 .text-gray-500 {
@@ -456,13 +399,15 @@
   color: rgb(107 114 128 / var(--tw-text-opacity))
 }
 
-.text-gray-300 {
+.text-gray-600 {
   --tw-text-opacity: 1;
-  color: rgb(209 213 219 / var(--tw-text-opacity))
+  color: rgb(75 85 99 / var(--tw-text-opacity))
 }
 
-.underline {
-  text-decoration-line: underline
+.shadow {
+  --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
 }
 
 .shadow-none {
@@ -471,48 +416,10 @@
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
 }
 
-.shadow {
-  --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
-  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
-}
-
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
 }
 
-.transition {
-  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
-  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
-  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 150ms
-}
-
-.duration-300 {
-  transition-duration: 300ms
-}
-
-.ease-in-out {
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1)
-}
-
-.hover\:ml-2\.5:hover {
-  margin-left: 0.625rem
-}
-
-.hover\:ml-2:hover {
-  margin-left: 0.5rem
-}
-
-.hover\:inline-block:hover {
-  display: inline-block
-}
-
-.hover\:cursor-pointer:hover {
-  cursor: pointer
-}
-
 .focus\:outline-none:focus {
   outline: 2px solid transparent;
   outline-offset: 2px
@@ -523,14 +430,18 @@
     margin: 0.5rem
   }
 
-  .sm\:rounded-lg {
-    border-radius: 0.5rem
+  .sm\:m-4 {
+    margin: 1rem
   }
 
   .sm\:rounded {
     border-radius: 0.25rem
   }
 
+  .sm\:rounded-lg {
+    border-radius: 0.5rem
+  }
+
   .sm\:border {
     border-width: 1px
   }
@@ -540,15 +451,6 @@
     border-color: rgb(209 213 219 / var(--tw-border-opacity))
   }
 
-  .sm\:px-3 {
-    padding-left: 0.75rem;
-    padding-right: 0.75rem
-  }
-
-  .sm\:pt-3 {
-    padding-top: 0.75rem
-  }
-
   .sm\:shadow {
     --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
     --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);