@steedos-widgets/amis-lib 1.3.4-beta.5 → 1.3.4-beta.6

package/dist/index.esm.js

@@ -452,39 +452,39 @@ function getCreatedInfoTpl(formFactor){
     const href = Router.getObjectDetailPath({
         formFactor, appId: "admin", objectName: 'users', recordId: '${created_by._id}'
     });
-    return `<div><a href='${href}'>\${_display.created_by.label}</a>\${_display.created}</div>`
+    return `<span><a href='${href}'>\${_display.created_by.label}</a>\${_display.created}</span>`
 }
 
 function getModifiedInfoTpl(formFactor){
     const href = Router.getObjectDetailPath({
         formFactor, appId: "admin", objectName: 'users', recordId: '${modified_by._id}'
     });
-    return `<div><a href='${href}'>\${_display.modified_by.label}</a>\${_display.modified}</div>`
+    return `<span><a href='${href}'>\${_display.modified_by.label}</a>\${_display.modified}</span>`
 }
 
 function getNumberTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getTimeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getDateTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 
 function getDateTimeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getUiFieldTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getUiFileSizeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 //TODO 处理name字段
@@ -495,7 +495,7 @@ async function getRefObjectNameFieldName(field){
 }
 
 function getSelectTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 function getSelectMap(selectOptions){
     let map = {};
@@ -1830,7 +1830,7 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-06-28 23:19:41
+ * @LastEditTime: 2023-09-23 11:25:18
  * @Description: 
  */
 
@@ -1849,18 +1849,31 @@ const getSchema$5 = async (uiSchema, ctx) => {
             formSchema = _.isString(payload.schema) ? JSON.parse(payload.schema) : payload.schema;
         }
 
+        const fields = ${JSON.stringify(uiSchema.fields)};
+        const selectedRowResponseResult = api.body.selectedRowResponseResult;
+        let defaultData = {}; 
+
+        if(!_.isEmpty(selectedRowResponseResult)){
+            const fieldsKeys = _.keys(fields);
+            // 如果新建记录时复制的数据中有omit或其他不相关字段数据时不应该一起保存到数据库，
+            // 原规则见：https://github.com/steedos/steedos-frontend/issues/297
+            _.forEach(selectedRowResponseResult, (val, key) => {
+              if (fieldsKeys.indexOf(key) > -1 && fields[key].omit !== true) {
+                defaultData[key] = val;
+              }
+            })
+        }
+
         const _master = api.body._master;
         if(_master && _master._isRelated){
             const relatedKey = _master.relatedKey;
             const masterObjectName = _master.objectName;
             const recordId = _master.recordId;
             let relatedKeySaveValue = recordId;
-            const fields = ${JSON.stringify(uiSchema.fields)};
             const relatedField = fields[relatedKey];
             if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
                 relatedKeySaveValue = _master.record[relatedField.reference_to_field];
             }
-            let defaultData = {}; 
             let relatedKeyValue; 
             if(!_.isString(relatedField.reference_to)){
                 relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
@@ -1870,6 +1883,9 @@ const getSchema$5 = async (uiSchema, ctx) => {
                 relatedKeyValue = relatedKeySaveValue;
             }
             defaultData[relatedKey]=relatedKeyValue;
+        }
+
+        if(!_.isEmpty(defaultData)){
             if(payload.schema){
                 // 表单微页面第一层要求是page
                 formSchema.data.defaultData = defaultData;
@@ -1892,6 +1908,13 @@ const getSchema$5 = async (uiSchema, ctx) => {
             });
         }, 200);
     `;
+    const getSelectedRowsScript = `
+        const uiSchema = event.data.uiSchema;
+        const objectName = event.data.objectName;
+        const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
+        const selectedItems = listViewRef.props.store.toJSON().selectedItems || [];
+        event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
+    `;
     return {
         "type": "service",
         "body": [
@@ -1904,6 +1927,21 @@ const getSchema$5 = async (uiSchema, ctx) => {
                     "click": {
                         "weight": 0,
                         "actions": [
+                            {
+                                "actionType": "custom",
+                                "script": getSelectedRowsScript
+                            },
+                            {
+                                "actionType": "ajax",
+                                "outputVar": "selectedRowResponseResult",
+                                "args": {
+                                    "api": {
+                                        "url": "${context.rootUrl}/api/v1/${uiSchema.name}/${selectedIds|first}",
+                                        "method": "get"
+                                    }
+                                },
+                                "expression": "${selectedIds.length > 0}"
+                            },
                             {
                                 "actionType": "dialog",
                                 "dialog": {
@@ -1921,7 +1959,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                         "displayAs": "${displayAs}",
                                         "uiSchema": "${uiSchema}",
                                         "isLookup": "${isLookup}",
-                                        "listName": "${listName}"
+                                        "listName": "${listName}",
+                                        "selectedRowResponseResult": "${selectedRowResponseResult}",
                                     },
                                     "title":i18next.t('frontend_form_new') + " ${uiSchema.label | raw}",
                                     "body": [
@@ -1933,7 +1972,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                                 "data": {
                                                     "isLookup": "${isLookup}",
                                                     "_master": "${_master}",
-                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}"
+                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
+                                                    "selectedRowResponseResult": "${selectedRowResponseResult}"
                                                 },
                                                 "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
                                                 "method": "get",
@@ -10180,13 +10220,15 @@ async function getObjectCRUD(objectSchema, fields, options){
         rowClassNameExpr: options.rowClassNameExpr
       }, bodyProps);
 
-      body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
     }
 
     const defaults = options.defaults;
+    
+    const listSchema = (defaults && defaults.listSchema) || {};
+    body = defaultsDeep({}, listSchema, body);
+    body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
+
     if (defaults) {
-      const listSchema = defaults.listSchema || {};
-      body = defaultsDeep({}, listSchema, body);
       const headerSchema = defaults.headerSchema;
       const footerSchema = defaults.footerSchema;
       if (headerSchema || footerSchema) {