@steedos-widgets/sortable 1.3.4-beta.5 → 1.3.4-beta.7

package/dist/sortable.umd.js

@@ -20339,28 +20339,28 @@
     }
 
     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字段
@@ -20371,7 +20371,7 @@
     }
 
     function getSelectTpl(field){
-        return `<div>\${_display.${field.name}}</div>`
+        return `<span>\${_display.${field.name}}</span>`
     }
     function getSelectMap(selectOptions){
         let map = {};
@@ -21117,7 +21117,7 @@
      * @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-25 14:53:05
      * @Description: 
      */
 
@@ -21136,18 +21136,31 @@
             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] };
@@ -21157,6 +21170,9 @@
                 relatedKeyValue = relatedKeySaveValue;
             }
             defaultData[relatedKey]=relatedKeyValue;
+        }
+
+        if(!_.isEmpty(defaultData)){
             if(payload.schema){
                 // 表单微页面第一层要求是page
                 formSchema.data.defaultData = defaultData;
@@ -21178,6 +21194,18 @@
                 "componentId": "object_actions_drawer_${uiSchema.name}"
             });
         }, 200);
+    `;
+        const getSelectedRowsScript = `
+        const isLookup = event.data.isLookup;
+        if(isLookup){
+            // lookup弹出窗口的新建功能不需要支持复制新建
+            return;
+        }
+        const uiSchema = event.data.uiSchema;
+        const objectName = event.data.objectName;
+        const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
+        const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
+        event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
     `;
         return {
             "type": "service",
@@ -21191,6 +21219,21 @@
                         "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": {
@@ -21208,7 +21251,8 @@
                                             "displayAs": "${displayAs}",
                                             "uiSchema": "${uiSchema}",
                                             "isLookup": "${isLookup}",
-                                            "listName": "${listName}"
+                                            "listName": "${listName}",
+                                            "selectedRowResponseResult": "${selectedRowResponseResult}",
                                         },
                                         "title":instance.t('frontend_form_new') + " ${uiSchema.label | raw}",
                                         "body": [
@@ -21220,7 +21264,8 @@
                                                     "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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.4-beta.5",
+  "version": "1.3.4-beta.7",
   "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": "1.3.4-beta.5"
+    "@steedos-widgets/amis-lib": "1.3.4-beta.7"
   },
-  "gitHead": "e2751c5e5386daeec40237feb1476d7dcb79cc97"
+  "gitHead": "ff6cd4d700006d36bf421e097c380042337e6f48"
 }