@steedos-widgets/amis-object 1.2.1 → 1.2.2

package/dist/amis/AmisRecordService.d.ts

@@ -0,0 +1,10 @@
+export declare const AmisRecordService: (props: any) => Promise<{
+    type: string;
+    body: any[];
+    data: {
+        "_master.objectName": string;
+        "_master.recordId": string;
+    };
+    style: any;
+    onEvent: any;
+}>;

package/dist/amis/index.d.ts

@@ -5,6 +5,7 @@ export * from './AmisObjectTable';
 export * from './AmisObjectCalendar';
 export * from './AmisRecordDetailHeader';
 export * from './AmisRecordDetail';
+export * from './AmisRecordService';
 export * from './AmisRecordDetailRelatedList';
 export * from './AmisRecordDetailRelatedLists';
 export * from './AmisSelectUser';

package/dist/amis-object.cjs.js

@@ -1750,8 +1750,8 @@ var config = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-04-11 13:58:24
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-04-16 17:04:16
  * @Description: 
  */
 
@@ -1829,6 +1829,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                         "context": "${context}",
                                         "global": "${global}",
                                         "listViewId": "${listViewId}",
+                                        "displayAs": "${displayAs}",
                                         "uiSchema": "${uiSchema}",
                                         "isLookup": "${isLookup}",
                                         "listName": "${listName}"
@@ -4127,7 +4128,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
               {
                 "type": "button",
                 "label": "重命名",
-                "visibleOn": "(global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && ['all', 'recent', 'my'].indexOf(listName) == -1",
+                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
                 "onEvent": {
                   "click": {
                     "weight": 0,
@@ -4182,7 +4183,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
               {
                 "type": "button",
                 "label": "共享设置",
-                "visibleOn": "global.user.is_space_admin && ['all', 'recent', 'my'].indexOf(listName) == -1",
+                "disabledOn": "!(global.user.is_space_admin && !!uiSchema.list_views[listName].owner)",
                 "onEvent": {
                   "click": {
                     "weight": 0,
@@ -4222,7 +4223,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
               {
                 "type": "button",
                 "label": "过滤设置",
-                "visibleOn": "(global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && ['all', 'recent', 'my'].indexOf(listName) == -1",
+                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
                 "onEvent": {
                   "click": {
                     "weight": 0,
@@ -4284,7 +4285,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
               {
                 "type": "button",
                 "label": "显示的列",
-                "visibleOn": "(global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && ['all', 'recent', 'my'].indexOf(listName) == -1",
+                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
                 "onEvent": {
                   "click": {
                     "weight": 0,
@@ -4343,10 +4344,74 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                   }
                 }
               },
+              {
+                "type": "button",
+                "label": "默认排序规则",
+                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
+                "onEvent": {
+                  "click": {
+                    "weight": 0,
+                    "actions": [
+                      {
+                        "dialog": {
+                          "type": "dialog",
+                          "title": "弹框标题",
+                          "data": {
+                            "&": "$$",
+                            "objectName": "${objectName}",
+                            "recordId": "${uiSchema.list_views[listName]._id}",
+                            "listName": "${listName}",
+                            "appId": "${appId}"
+                          },
+                          "body": [
+                            {
+                              "type": "steedos-object-form",
+                              "label": "对象表单",
+                              "objectApiName": "object_listviews",
+                              "recordId": "${recordId}",
+                              "className": "",
+                              "id": "u:061f158b4c5a",
+                              "mode": "edit",
+                              "fields": [
+                                "sort",
+                                "sort.$.field_name",
+                                "sort.$.order"
+                              ],
+                              "onEvent": {
+                                "submitSucc": {
+                                  "weight": 0,
+                                  "actions": [
+                                    {
+                                      "args": {
+                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                        "blank": false
+                                      },
+                                      "actionType": "url"
+                                    }
+                                  ]
+                                }
+                              },
+                              "fieldsExtend": "{\n  \"sort\": {\n    \"amis\": {\n      \"type\": \"tabs-transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/sortFields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
+                              "initApiAdaptor": "let sort;\nif (recordId) {\n  sort = payload.data.initialValues.sort;\n  //数据格式转换\n  if (sort instanceof Array) {\n    sort = lodash.map(sort, (item) => {\n      return item.field_name + ':' + (item.order || 'asc')\n    });\n  }\n}\npayload.data.initialValues.sort = sort;\ndelete payload.extensions;",
+                              "apiRequestAdaptor": "const recordId = api.body.recordId;\n//数据格式转换\nif (typeof formData.sort == 'string') {\n  formData.sort = formData.sort?.split(',');\n}\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\nif (recordId) {\n  query = 'mutation{record: ' + objectName + '__update(id: \"' + recordId + '\", doc: {__saveData}){_id}}';\n}\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\n"
+                            }
+                          ],
+                          "showCloseButton": true,
+                          "showErrorMsg": true,
+                          "showLoading": true,
+                          "id": "u:d3f6947b6acf",
+                          "size": "lg"
+                        },
+                        "actionType": "dialog"
+                      }
+                    ]
+                  }
+                }
+              },
               {
                 "type": "button",
                 "label": "删除",
-                "visibleOn": "(global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && ['all', 'recent', 'my'].indexOf(listName) == -1",
+                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
                 "confirmText": "如果您删除此列表视图，该视图将为所有具备访问权限的用户永久删除。是否确定要删除？",
                 "onEvent": {
                   "click": {
@@ -4707,7 +4772,6 @@ function getLookupSapceUserTreeSchema(){
               {
                 "actionType": "custom",
                 "script": `
-                debugger;
                 const scope = event.context.scoped;
                 //TODO: 将form中的value一同加入筛选内
                 // var filterForm = scope.parent.parent.getComponents().find(function(n){
@@ -6191,7 +6255,7 @@ var index = /*#__PURE__*/Object.freeze({
 
 const API_CACHE = 100;
 
-function getReadonlyFormAdaptor(fields){
+function getReadonlyFormAdaptor(object, fields){
     let scriptStr = '';
     const selectFields = ___default__namespace.filter(fields, function(field){return field.name.indexOf('.') < 0 && ((field.type == 'select' && field.options) || ((field.type == 'lookup' || field.type == 'master_detail') && !field.reference_to))});
     const gridAndObjectFieldsName = ___default__namespace.map(___default__namespace.filter(fields, function(field){return field.name.indexOf('.') < 0 && (field.type === 'object' || field.type === 'grid')}), 'name');
@@ -6250,6 +6314,7 @@ function getReadonlyFormAdaptor(fields){
             console.error(e)
         }
         payload.data = data;
+        payload.data.__objectName = "${object.name}";
         payload.data.__record = record;
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
@@ -6267,7 +6332,7 @@ async function getReadonlyFormInitApi(object, recordId, fields, options){
         url: getApi$2()+"&recordId=${recordId}",
         cache: API_CACHE,
         // requestAdaptor: "console.log('getReadonlyFormInitApi requestAdaptor', api);return api;",
-        adaptor: getReadonlyFormAdaptor(fields),
+        adaptor: getReadonlyFormAdaptor(object, fields),
         data: await getFindOneQuery$1(object, recordId, fields, options),
         headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -6985,6 +7050,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                   eventName: "recordLoaded"
                 },
                 data: {
+                  objectName: "${event.data.__objectName}",
                   record: "${event.data.__record}"
                 }
               },
@@ -7421,7 +7487,7 @@ async function getTableApi(mainObject, fields, options){
     const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
     if(options.isRelated){
-        api.url += "&recordId=${recordId}";
+        api.url += "&recordId=${_master.recordId}";
     }
 
     api.data.$term = "$term";
@@ -8665,8 +8731,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-12 14:24:09
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-04-14 11:10:07
  * @Description:
  */
 
@@ -9152,6 +9218,41 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     }
 }
 
+async function getRecordServiceSchema(objectName, appId, props = {}) {
+    const uiSchema = await getUISchema(objectName);
+    return {
+        uiSchema,
+        amisSchema: {
+            "type": "service",
+            "body": [],
+            data: {
+                "_master.objectName": "${objectName}",
+                "_master.recordId": "${recordId}"
+            },
+            "style": {
+                "padding": "var(--Page-body-padding)",
+                ...props.style
+            },
+            onEvent: {
+                "recordLoaded": {
+                    "actions": [
+                        {
+                            "actionType": "reload",
+                            "data": {
+                                "name": `\${record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
+                                "_master.record": `\${record}`,
+                                // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
+                                "_master.objectName": "${objectName}",
+                                "_master.recordId": "${recordId}"
+                            }
+                        }
+                    ]
+                },
+                ...props.onEvent
+            }
+        }
+    }
+}
 
 // 获取单个相关表
 async function getObjectRelated(
@@ -12071,6 +12172,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getRecordDetailSchema: getRecordDetailSchema,
     getRecordPageInitSchema: getRecordPageInitSchema,
     getRecordPermissions: getRecordPermissions,
+    getRecordServiceSchema: getRecordServiceSchema,
     getRelatedFieldValue: getRelatedFieldValue,
     getRelatedListSchema: getRelatedListSchema,
     getRelatedsCount: getRelatedsCount,
@@ -12550,6 +12652,8 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 schema = _d.sent();
                 amisSchema = schema.amisSchema;
                 if (defaultData) {
+                    // 让ObjectForm支持props中的dafaultData属性与上层组件配置的defaultData混合
+                    // 为了解决相关表新建时如果是表单类型微页面，因为找不到ObjectForm在哪层而造成无法设置ObjectForm的defaultData的问题
                     amisSchema.data.defaultData = __assign$2({ "&": "${defaultData}" }, defaultData);
                 }
                 uiSchema = schema.uiSchema;
@@ -12645,7 +12749,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                             },
                             {
                                 "actionType": "reload",
-                                "expression": "${(event.data.recordId || event.data.__deletedRecord === true) && event.data._isRelated != true}" //不是新建, 则刷新列表
+                                "expression": "${(event.data.recordId || event.data.__deletedRecord === true || event.data.displayAs === 'split') && event.data._isRelated != true}" //不是新建, 或分栏模式下新建主对象记录, 则刷新列表
                             }
                         ]
                     };
@@ -12839,7 +12943,8 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
                                     "_id": "\${event.data.record._id}",
                                     "recordId": "\${event.data.record._id}",
                                     "recordLoaded": true,
-                                }
+                                },
+                                "expression": "${event.data.objectName == '".concat(objectUiSchema === null || objectUiSchema === void 0 ? void 0 : objectUiSchema.name, "'}")
                             }
                         ]
                     }
@@ -12886,6 +12991,36 @@ var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void
     });
 }); };
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-12-08 10:32:17
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-04-14 11:30:21
+ * @Description:
+ */
+var AmisRecordService = function (props) { return __awaiter(void 0, void 0, void 0, function () {
+    var className, _a, objectApiName, body, style, schema;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                className = props.className, props.$schema, props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, props.recordId, props.fields, body = props.body, style = props.style;
+                return [4 /*yield*/, getRecordServiceSchema(objectApiName)];
+            case 1:
+                schema = (_b.sent()).amisSchema;
+                if (body) {
+                    schema.body = body;
+                }
+                if (className) {
+                    schema.className = className;
+                }
+                if (style) {
+                    Object.assign(schema.style, style);
+                }
+                return [2 /*return*/, schema];
+        }
+    });
+}); };
+
 var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, void 0, void 0, function () {
     var objectApiName, recordId, relatedObjectApiName, relatedKey, top, perPage, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, formFactor, schema;
     return __generator(this, function (_b) {
@@ -14033,6 +14168,7 @@ exports.AmisRecordDetail = AmisRecordDetail;
 exports.AmisRecordDetailHeader = AmisRecordDetailHeader;
 exports.AmisRecordDetailRelatedList = AmisRecordDetailRelatedList;
 exports.AmisRecordDetailRelatedLists = AmisRecordDetailRelatedLists;
+exports.AmisRecordService = AmisRecordService;
 exports.AmisSelectFlow = AmisSelectFlow;
 exports.AmisSelectUser = AmisSelectUser;
 exports.AmisSteedosField = AmisSteedosField;