@steedos-widgets/sortable 3.6.13 → 6.3.0-beta.10

package/dist/sortable.umd.js

@@ -20446,10 +20446,23 @@
         if(ctx && ctx.isLookup){
             linkTarget = "target='_blank'";
         }
+        let nameLabel = field.name;
+        //若字段类型是lookup，则按照相关表tpl的label规则显示；若是其它类型，则显示_display或字段本身的值
+        if (field.type == "lookup") {
+            if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
+                if(!field.isTableField){
+                    nameLabel = `\${${field.name}__label}`;
+                }
+            } else {
+                nameLabel = `\${_display.${field.name}.label}`;
+            }
+        } else {
+            nameLabel = `\${_display.${field.name} || ${field.name}}`;
+        }
         if(ctx.isRelated && window.innerWidth >= 768){
-            return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
+            return `<a href="${href}" ${linkTarget} onclick="return false;">\${${nameLabel} | raw}</a>`
         }else {
-            return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+            return `<a href="${href}" ${linkTarget}>\${${nameLabel} | raw}</a>`
         }
     }
 
@@ -20574,7 +20587,7 @@
     }
 
     async function getFieldTpl (field, options){
-        if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel){
+        if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel && field.multiple !== true){
             return getNameTpl(field, options)
         }
         switch (field.type) {
@@ -20716,7 +20729,7 @@
     function getApi$2 (isMobile){
         if(isMobile);else {
             // return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/graphql"
-            return `\${context.rootUrl}/graphql?reload=\${additionalFilters}`
+            return `\${context.rootUrl}/graphql?reload=\${additionalFilters|join}`
         }
     }
 
@@ -21963,7 +21976,7 @@
                                       "title": "&nbsp;",
                                       "headerClassName": "hidden",
                                       "size": "lg",
-                                      "bodyClassName": "p-0 m-0",
+                                      "bodyClassName": "p-0 m-0 bg-gray-100",
                                       "closeOnEsc": true,
                                       "closeOnOutside": true,
                                       "resizable": true,
@@ -22825,7 +22838,8 @@
                                                 type: 'button',
                                                 actionType: 'confirm',
                                                 label: instance.t('frontend_form_save'),
-                                                primary: true
+                                                primary: true,
+                                                close: `object_actions_drawer_${uiSchema.name}`
                                             },
                                         ]
                                     }
@@ -24631,6 +24645,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     // const scope = event.context.scoped;
     // 如果点击过顶部搜索栏表单的取消按钮，会把此处event.data.__super.__super.__super中的搜索表单项的所有字段设置为null
     // 点击取消按钮后继续在表单项中输入过滤条件且最后没有点击回车按键或点击表单项搜索按钮的话，在快速搜索中点击回车按钮提交搜索会所顶部搜索表单中的字段值清空
+    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
+    if(!filterForm){
+      return;
+    }
     let isLookup = event.data.isLookup;
     let __lookupField = event.data.__lookupField;
     let __changedFilterFormValuesKey = "__changedFilterFormValues";
@@ -24641,9 +24659,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       }
       __changedFilterFormValuesKey += lookupTag;
     }
-    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     setTimeout(function(){
-      filterForm.setValues(event.data[__changedFilterFormValuesKey]);
+      filterForm && filterForm.setValues(event.data[__changedFilterFormValuesKey]);
     }, 500);
   `;
 
@@ -25040,7 +25057,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
      * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2024-02-23 16:37:06
+     * @LastEditTime: 2024-04-26 16:46:44
      * @Description:
      */
 
@@ -25273,37 +25290,44 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
          * 本次存储代码段
          */
         try {
-          const listViewPropsStoreKey = location.pathname + "/crud";
-          let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
-          /**
-           * localListViewProps规范来自crud请求api中api.data.$self参数值的。
-           * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
-           * __searchable__...:顶部放大镜搜索条件
-           * filter:右侧过滤器
-           * perPage:每页条数
-           * page:当前页码
-           * orderBy:排序字段
-           * orderDir:排序方向
-           */
-          if (localListViewProps) {
-            localListViewProps = JSON.parse(localListViewProps);
-            // localListViewProps.perPage = 3;
-            let listSchema = {};
-            if(localListViewProps.orderBy){
-                listSchema.orderBy = localListViewProps.orderBy;
-            }
-            if(localListViewProps.orderDir){
-                listSchema.orderDir = localListViewProps.orderDir;
-            }
+            const listViewPropsStoreKey = location.pathname + "/crud";
+            let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+            /**
+             * localListViewProps规范来自crud请求api中api.data.$self参数值的。
+             * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
+             * __searchable__...:顶部放大镜搜索条件
+             * filter:右侧过滤器
+             * perPage:每页条数
+             * page:当前页码
+             * orderBy:排序字段
+             * orderDir:排序方向
+             */
+            if (localListViewProps) {
+                localListViewProps = JSON.parse(localListViewProps);
+                // localListViewProps.perPage = 3;
+                let listSchema = {};
+                if (localListViewProps.orderBy) {
+                    listSchema.orderBy = localListViewProps.orderBy;
+                }
+                if (localListViewProps.orderDir) {
+                    listSchema.orderDir = localListViewProps.orderDir;
+                }
 
-            if(localListViewProps.perPage){
-                listSchema.perPage = localListViewProps.perPage;
+                if (localListViewProps.perPage) {
+                    listSchema.perPage = localListViewProps.perPage;
+                }
+                defaults.listSchema = lodash.exports.defaultsDeep({}, listSchema, defaults.listSchema || {});
             }
-            defaults.listSchema = lodash.exports.defaultsDeep({}, listSchema, defaults.listSchema || {});
-          }
         }
         catch (ex) {
-          console.error("本地存储中crud参数解析异常：", ex);
+            console.error("本地存储中crud参数解析异常：", ex);
+        }
+
+        if (window.innerWidth > 768) {
+            // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight，且允许重写微页面中重新组件autoFillHeight属性
+            defaults.listSchema = lodash.exports.defaultsDeep({}, defaults.listSchema || {}, {
+                autoFillHeight: true
+            });
         }
 
         ctx.defaults = defaults;
@@ -25864,7 +25888,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         });
 
         // 把自动填充规则中依赖的字段也加到api请求中
-        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        let autoFillMapping = field.auto_fill_mapping;
         if (autoFillMapping && autoFillMapping.length) {
             autoFillMapping.forEach(function (item) {
                 if(!lodash.exports.find(tableFields, function(f){
@@ -26014,7 +26038,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
                     }
                 }
             }
@@ -26336,7 +26360,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             ];
 
             // 把自动填充规则中依赖的字段也加到api请求中
-            let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+            let autoFillMapping = field.auto_fill_mapping;
             if (autoFillMapping && autoFillMapping.length) {
                 autoFillMapping.forEach(function (item) {
                     queryFields.push(refObjectConfig.fields[item.from]);
@@ -26431,7 +26455,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
                     }
                 }
             }
@@ -26578,14 +26602,25 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     async function getAutoFill(field, refObject) {
-        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        let autoFillMapping = field.auto_fill_mapping;
         if (autoFillMapping && autoFillMapping.length) {
             let fillMapping = {};
+            if (field.multiple) {
+                autoFillMapping.forEach(function (item) {
+                    //from的字段类型为lookup、master_detail、select时，需要保留数组格式；其他类型需要转变为字符串格式
+                    if (lodash.exports.includes(["lookup","master_detail","select"], refObject.fields[item.from].type)) {
+                        fillMapping[item.to] = `\${items | pick:${item.from}}`;
+                    } else {
+                        fillMapping[item.to] = `\${items | pick:${item.from} | join}`;
+                    }
+                });
+            }else {
+                autoFillMapping.forEach(function (item) {
+                    fillMapping[item.to] = `\${${item.from}}`;
+                });
+            }
             // let fieldsForApi = [];
-            autoFillMapping.forEach(function (item) {
-                fillMapping[item.to] = `\${${item.from}}`;
-                // fieldsForApi.push(item.from);
-            });
+            // fieldsForApi.push(item.from);
             // let api = {
             //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
             //     "url": `/api/v1/${refObject.name}/\${${field.name}}?fields=${JSON.stringify(fieldsForApi)}`,
@@ -26687,7 +26722,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 amisSchema = lodash.exports.defaultsDeep({}, pageAmisSchema, amisSchema);
             }
         }
-        const autoFill = await getAutoFill(field);
+        const autoFill = await getAutoFill(field, refObject);
         if(autoFill){
             amisSchema.autoFill = autoFill;
             // 这里不配置initAutoFill值，按amis规则initAutoFill默认值为fillIfNotSet处理--需要amis sdk 版本 > 3.6.3-patch.6（不包括）版本

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.13",
+  "version": "6.3.0-beta.10",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "3.6.13"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.10"
   },
-  "gitHead": "f0ceaf940b910c7881f216deec2cdd410ae94ce4"
+  "gitHead": "9bde0fd0766dc725e40940998b53e4f8fbeaea05"
 }