@steedos-widgets/amis-lib 6.3.13-beta.8 → 6.3.13

package/dist/index.esm.js

@@ -2347,7 +2347,7 @@ async function getColumnItemOnClick(field, options){
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
             "recordId": `\${${options.idFieldName}}`,//审批微页面依赖了作用域中的recordId
-            "_tableObjectName": options.objectName
+            "_lookupObjectName": options.objectName
         }
     }) : {
         "type": "steedos-record-detail",
@@ -2358,7 +2358,7 @@ async function getColumnItemOnClick(field, options){
         "data": {
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
-            "_tableObjectName": options.objectName
+            "_lookupObjectName": options.objectName
         }
     };
 
@@ -2531,7 +2531,7 @@ async function getTableColumns(object, fields, options){
                 body: {
                     type: "steedos-field",
                     static: true,
-                    tableObjectName: options.objectName,
+                    isLookupInTable: true,
                     config: {
                         type: "lookup",
                         reference_to: field.reference_to,
@@ -3305,6 +3305,16 @@ async function getTableApi(mainObject, fields, options){
         return api;
     `;
     api.adaptor = `
+
+    if(payload.errors && payload.errors.length > 0){
+        return {
+            status: 500,
+            msg: payload.errors[0].message,
+            data: {}
+        }
+    }
+
+
     let fields = ${JSON.stringify(_$1.map(fields, 'name'))};
     // 这里把行数据中所有为空的字段值配置为空字符串，是因为amis有bug：crud的columns中的列如果type为static-前缀的话，行数据中该字段为空的话会显示为父作用域中同名变量值，见：https://github.com/baidu/amis/issues/9556
     (payload.data.rows || []).forEach((itemRow) => {
@@ -3347,10 +3357,13 @@ async function getTableApi(mainObject, fields, options){
                     // item[key] = value
                     // PC客户端附件子表列表点击标题预览附件功能依赖了_id，所以这里拼出来
                     let itemKeyValue = item[key];
-                    item[key] = value.map(function(item, index){
-                        item._id = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
-                        item.value = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
-                        return item;
+                    item[key] = value.map(function(curValue, index){
+                        let fileId = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
+                        // 克隆一份对象，避免下方value递归污染curValue
+                        let result = _.clone(curValue);
+                        result._id = fileId;
+                        result.value = fileId;
+                        return result;
                     });
                 }else{
                     item[key] = _.map(value, (item)=>{
@@ -3596,6 +3609,11 @@ function getReadonlyFormAdaptor(object, fields, options){
             objectName: "${object.name}",
             recordId: record._id
         }
+        if(window.location.pathname.endsWith("/"+record._id)){
+            payload.data.mainRecord= {
+                record
+            };
+        }
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
     if(payload.errors){
@@ -4864,8 +4882,8 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-12-26 20:28:43
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-07-22 14:49:16
  * @Description: 
  */
 
@@ -4940,7 +4958,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
         }
         const uiSchema = event.data.uiSchema;
         const objectName = event.data.objectName;
-        const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
+        const crudId = event.data.crudId || "listview_" + objectName;
+        const listViewRef = event.context.scoped.getComponentById(crudId);
         const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
         event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
     `;
@@ -5062,8 +5081,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:49:58
- * @LastEditors: yinlianghui@hotoa.com yinlianghui@hotoa.com
- * @LastEditTime: 2024-05-19 10:01:07
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-07-14 15:52:24
  * @Description:
  */
 
@@ -5093,6 +5112,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
       : page.schema;
   }
   
+  // console.log('formSchema====>', formSchema);
 
   return {
     type: "service",
@@ -5117,7 +5137,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   showCloseButton: true,
                   "data": {
                     "&": "$$",
-                    "_master": "${_master}",
+                    "_master": "${mainRecord}",
                     "_master._isRelated": "${_isRelated}",
                     "_master.relatedKey": "${relatedKey}"
                   },
@@ -5218,12 +5238,12 @@ const getSchema$3 = (uiSchema)=>{
                             {
                                 "actionType": "broadcast",
                                 "args": {
-                                  "eventName": "@data.changed.${_tableObjectName}"
+                                  "eventName": "@data.changed.${_lookupObjectName}"
                                 },
                                 "data": {
-                                  "objectName": "${_tableObjectName}"
+                                  "objectName": "${_lookupObjectName}"
                                 },
-                                "expression": `\${_tableObjectName != '${uiSchema.name}' && _tableObjectName}`
+                                "expression": `\${_lookupObjectName != '${uiSchema.name}' && _lookupObjectName}`
                             }
                           ]
                     }
@@ -5482,8 +5502,8 @@ const getSchema = async (uiSchema, ctx) => {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:53:07
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-28 17:06:22
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-07-22 14:49:34
  * @Description: 
  */
 
@@ -5513,12 +5533,13 @@ const StandardButtons = {
                 const {
                     appId,
                     objectName,
-                    uiSchema
+                    uiSchema,
+                    record
                 } = this;
                 const scopeId = this.scopeId || `amis-${appId}-${objectName}-listview`;
                 const scope = this.scope || SteedosUI?.getRef(scopeId);
-                //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
-                const listViewRef = scope.parent?.getComponentById(`listview_${uiSchema.name}`);
+                const crudId = record?.crudId || `listview_${uiSchema.name}`;
+                const listViewRef = scope.parent?.getComponentById(crudId);
                 if(_.isEmpty(listViewRef.props.store.toJSON().selectedItems)){
                     listViewRef.handleAction({}, {
                         "actionType": "toast",
@@ -9958,16 +9979,16 @@ async function getObjectForm(objectSchema, ctx){
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
               },
-              // 列表视图、对象表格组件上的lookup字段，点开右侧弹出drawer窗口，修改记录后刷新列表
+              // 列表视图、对象表格、对象表单组件上的lookup字段，点开右侧弹出drawer窗口，修改记录后刷新列表
               {
                 "actionType": "broadcast",
                 "args": {
-                  "eventName": "@data.changed.${_tableObjectName}"
+                  "eventName": "@data.changed.${_lookupObjectName}"
                 },
                 "data": {
-                  "objectName": "${_tableObjectName}"
+                  "objectName": "${_lookupObjectName}"
                 },
-                "expression": `\${_tableObjectName != '${objectSchema.name}' && _tableObjectName}`
+                "expression": `\${_lookupObjectName != '${objectSchema.name}' && _lookupObjectName}`
               },
               ...submitSuccActions,
               // {
@@ -12491,7 +12512,13 @@ async function lookupToAmisPicker(field, readonly, ctx){
             "__lookupField": {
                 "name": field.name,
                 "reference_to": refObjectConfig.name,
-                "reference_to_field": field.reference_to_field
+                "reference_to_field": field.reference_to_field,
+                "filters": field.filters,
+                "filtersFunction": field.filtersFunction,
+                "_filtersFunction": field._filtersFunction,
+                "inFilterForm": ctx.inFilterForm,
+                "listviewFilter": listviewFilter,
+                "listviewFiltersFunction": listviewFiltersFunction
             }
         });
 
@@ -14168,7 +14195,8 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             _field.removable = false;
             _field.value = [null,null];
             _field.items = {
-                type: "input-number"
+                type: "input-number",
+                clearValueOnEmpty: true
             };
             _field.is_wide = true;
             fieldNamePrefix = `${fieldNamePrefix}between__`;
@@ -14216,6 +14244,10 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             delete _field.amis.hidden;
             delete _field.amis.hiddenOn;
             delete _field.amis.autoFill;
+            if(_field.type.indexOf("-range") > -1 || _field.type === 'input-array'){
+                // 范围类型不允许变更type，否则会因为某些属性兼容性问题报错页面奔溃，比如input-date-range类型有shortcuts属性，改为input-date后其shortcuts属性有兼容性问题
+                delete _field.amis.type;
+            }
         }
 
         const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));