@steedos-widgets/amis-lib 3.6.6 → 3.6.7-beta.2

package/dist/index.esm.js

@@ -689,7 +689,7 @@ function getSwitchTpl(field){
 
 function getPasswordTpl(field){
     return `<% if (data.${field.name}) { %>
-        <span>······</span>
+        <span>******</span>
         <% } %>`
 }
 
@@ -2744,14 +2744,14 @@ async function getTableSchema$1(object, fields, options){
                 headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
                 className: "",
                 draggable: false,
-                defaultParams: getDefaultParams$1(options),
                 card: card,
                 syncLocation: false,
                 keepItemSelectionOnPageChange: true,
                 checkOnItemClick: isLookup ? true : false,
                 labelTpl: `\${${options.labelFieldName}}`,
                 autoFillHeight: false, // 自动高度效果不理想,先关闭
-                columnsTogglable: false
+                columnsTogglable: false,
+                ...getDefaultParams$1(options) //不可以使用crud的defaultParams属性，会造成翻页bug，https://github.com/steedos/steedos-platform/issues/6576
             }
         }
 
@@ -2777,7 +2777,6 @@ async function getTableSchema$1(object, fields, options){
         headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
         draggable: false,
-        defaultParams: getDefaultParams$1(options),
         columns: columns,
         syncLocation: false,
         keepItemSelectionOnPageChange: true,
@@ -2785,7 +2784,8 @@ async function getTableSchema$1(object, fields, options){
         labelTpl: `\${${options.labelFieldName}}`,
         autoFillHeight: false, // 自动高度效果不理想,先关闭
         columnsTogglable: false,
-        ...treeConfig
+        ...treeConfig,
+        ...getDefaultParams$1(options) //不可以使用crud的defaultParams属性，会造成翻页bug，https://github.com/steedos/steedos-platform/issues/6576
     }
 }
 
@@ -4388,7 +4388,6 @@ async function getListSchema$1(fields, options){
         name: "thelist",
         draggable: false,
         headerToolbar: ['reload'],
-        defaultParams: getDefaultParams(options),
         syncLocation: false,
         keepItemSelectionOnPageChange: true,
         checkOnItemClick: false,
@@ -4410,7 +4409,8 @@ async function getListSchema$1(fields, options){
                     })
                 }
             ]
-        }
+        },
+        ...getDefaultParams(options) //不可以使用crud的defaultParams属性，会造成翻页bug，https://github.com/steedos/steedos-platform/issues/6576
     }
 }
 
@@ -4431,7 +4431,6 @@ async function getCardSchema(fields, options){
         name: "cards",
         draggable: false,
         headerToolbar: ['statistics', 'pagination'],
-        defaultParams: getDefaultParams(options),
         syncLocation: false,
         keepItemSelectionOnPageChange: false,
         checkOnItemClick: false,
@@ -4442,7 +4441,8 @@ async function getCardSchema(fields, options){
                 "title": title
               },
             "body": [...listBody.columns]
-          }
+          },
+        ...getDefaultParams(options)
     }
 }
 
@@ -9993,9 +9993,7 @@ async function getListSchema(
         }
 
         if(localListViewProps.perPage){
-            listSchema.defaultParams = {
-                perPage: localListViewProps.perPage
-            };
+            listSchema.perPage = localListViewProps.perPage;
         }
         defaults.listSchema = defaultsDeep$1({}, listSchema, defaults.listSchema || {});
       }
@@ -11316,6 +11314,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
         var fieldFilters = ${JSON.stringify(field.filters)};
         if(fieldFilters && fieldFilters.length){
+            var filtersForString = JSON.stringify(fieldFilters);
+            if(filtersForString.indexOf('$') > -1) {
+                var currentAmis = amisRequire('amis');
+                fieldFilters = JSON.parse(currentAmis.evaluate(filtersForString, api.data.$self.__super))
+            }
             filters.push(fieldFilters);
         }
         
@@ -11716,6 +11719,11 @@ async function lookupToAmisSelect(field, readonly, ctx){
 
         var fieldFilters = ${JSON.stringify(field.filters)};
         if(fieldFilters && fieldFilters.length){
+            var filtersForString = JSON.stringify(fieldFilters);
+            if(filtersForString.indexOf('$') > -1) {
+                var currentAmis = amisRequire('amis');
+                fieldFilters = JSON.parse(currentAmis.evaluate(filtersForString, api.data.$))
+            }
             filters.push(fieldFilters);
         }
 
@@ -14917,7 +14925,8 @@ const getAmisInputTableSchema = async (props) => {
                 }
             }
             return value;
-        }
+        },
+        "required": props.required
     };
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.unshift({
@@ -15012,7 +15021,8 @@ const getAmisInputTableSchema = async (props) => {
         "visible":  props.$schema.visible,
         "hiddenOn": props.$schema.hiddenOn,
         "hidden": props.$schema.hidden,
-        className
+        "required": props.required,
+        className,
     };
     // console.log("===schema===", schema);
     return schema;
@@ -15314,9 +15324,7 @@ async function getSpaceUsersPickerAmisSchema(spaceUserSchema, name, options) {
                 "switch-per-page",
                 "pagination"
             ],
-            "defaultParams": {
-                "perPage": 50
-            },
+            "perPage": 50,
             "columns": [
                 {
                     "name": "_index",