@steedos-widgets/amis-object 1.3.2-beta.3 → 1.3.2-beta.5

package/dist/amis-object.cjs.js

@@ -13806,8 +13806,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-25 11:55:15
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-09-14 11:34:23
  * @Description:
  */
 
@@ -14166,6 +14166,12 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                 if (uiSchema.fields[column]) {
                     fields.push(Object.assign({}, uiSchema.fields[column], ctx));
                 }
+                else if(ctx.extra){
+                    // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
+                    fields.push({
+                        name: column
+                    });
+                }
             }
         } else if (_$1.isObject(column)) {
             if (column.field.indexOf('.') > 0) {
@@ -19519,12 +19525,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-14 16:41:24
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-09-11 16:48:35
+ * @LastEditTime: 2023-09-14 13:08:43
  * @Description:
  */
 var getSelectFlowSchema = function (id, props) {
     var label = props.label, data = props.data, name = props.name, required = props.required, _a = props.action, action = _a === void 0 ? "query" : _a, _b = props.distributeInstanceId, distributeInstanceId = _b === void 0 ? "" : _b, _c = props.distributeStepId, distributeStepId = _c === void 0 ? "" : _c, _d = props.mode, mode = _d === void 0 ? "input-tree" : _d, className = props.className, onEvent = props.onEvent, _e = props.multiple, multiple = _e === void 0 ? false : _e, delimiter = props.delimiter, joinValues = props.joinValues, extractValue = props.extractValue, searchable = props.searchable, _f = props.showIcon, showIcon = _f === void 0 ? true : _f, _g = props.showRadio, showRadio = _g === void 0 ? false : _g, showOutline = props.showOutline, initiallyOpen = props.initiallyOpen, unfoldedLevel = props.unfoldedLevel, treeContainerClassName = props.treeContainerClassName, _h = props.amis, amis = _h === void 0 ? {} : _h;
     // console.log(`=====onEvent`, onEvent)
+    var allData = props.allData;
+    if (allData != true) {
+        allData = false;
+    }
     return __assign$2({ type: mode, id: id, label: label, name: name, options: [], multiple: multiple, delimiter: delimiter, joinValues: joinValues, extractValue: extractValue, searchable: searchable, showOutline: showOutline, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, 
         // className: `overflow-y-auto ` + className,
         className: className, required: required, treeContainerClassName: treeContainerClassName, heightAuto: true, menuTpl: mode === 'input-tree' ? {
@@ -19666,7 +19676,7 @@ var getSelectFlowSchema = function (id, props) {
         } : '', source: {
             method: "post",
             url: "${context.rootUrl}/graphql?keywords=${keywords}",
-            requestAdaptor: "\n                const keywords = api.body.keywords || '';\n                const appId = '".concat(data.app_id || "", "';\n                api.data = {\n                    query: `\n                        {\n                        options: flows__getList(action: \"").concat(action, "\", keywords: \"${keywords}\", appId: \"${appId}\", distributeInstanceId: \"").concat(distributeInstanceId, "\", distributeStepId: \"").concat(distributeStepId, "\"){\n                          value:_id\n                          label:name\n                          children: flows{\n                            value: _id,\n                            label: name\n                          }\n                        }\n                      }\n                    `\n                }\n            "),
+            requestAdaptor: "\n                const keywords = api.body.keywords || '';\n                const appId = '".concat(data.app_id || "", "';\n                api.data = {\n                    query: `\n                        {\n                        options: flows__getList(action: \"").concat(action, "\", keywords: \"${keywords}\", appId: \"${appId}\", distributeInstanceId: \"").concat(distributeInstanceId, "\", distributeStepId: \"").concat(distributeStepId, "\", allData: ").concat(allData, "){\n                          value:_id\n                          label:name\n                          children: flows{\n                            value: _id,\n                            label: name\n                          }\n                        }\n                      }\n                    `\n                }\n            "),
             adaptor: "\n                var options = payload.data.options;\n                if(options){\n                  options.forEach(function(item,index) {\n                      if(item.value != 'startFlows' && (!item.children || item.children.length == 0)){\n                          payload.data.options.splice(index,1)\n                      }\n                  })\n                }\n                // if(payload.data.options.length === 1 && payload.data.options[0].children.length === 1){\n                //   payload.data.value = payload.data.options[0].children[0].value\n                // }\n                return payload;\n            ",
             "headers": {
                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
@@ -19745,16 +19755,15 @@ var AmisInstanceDetail = function (props) { return __awaiter(void 0, void 0, voi
 }); };
 
 var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var formFactor, appId, objectApiName, display, page, listSchema;
+    var formFactor, appId, objectApiName, display, data, _display, page, listSchema;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                // console.time('PageListView')
-                console.log("PageListView====>", props);
-                formFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.listviewId, display = props.display, props.$schema, props.listName;
+                formFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.listviewId, display = props.display, props.$schema, props.listName, data = props.data;
+                _display = data.display || display;
                 //TODO  此代码应该在object page template中处理
-                if (display)
-                    Router$1.setTabDisplayAs(objectApiName, display);
+                if (_display)
+                    Router$1.setTabDisplayAs(objectApiName, _display);
                 return [4 /*yield*/, getPage({ type: 'list', appId: appId, objectName: objectApiName, formFactor: formFactor })];
             case 1:
                 page = _b.sent();
@@ -19803,13 +19812,14 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
 }); };
 
 var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var defaultFormFactor, appId, objectApiName, display, recordSchema, recordPage;
+    var defaultFormFactor, appId, objectApiName, display, data, _display, recordSchema, recordPage;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.recordId, display = props.display;
-                if (display) {
-                    Router$1.setTabDisplayAs(objectApiName, display);
+                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.recordId, display = props.display, data = props.data;
+                _display = data.display || display;
+                if (_display) {
+                    Router$1.setTabDisplayAs(objectApiName, _display);
                 }
                 recordSchema = {};
                 return [4 /*yield*/, getPage({ type: 'record', appId: appId, objectName: objectApiName, formFactor: defaultFormFactor })];