@steedos-widgets/amis-object 1.2.26 → 1.2.27

package/dist/amis-object.cjs.css

@@ -1213,7 +1213,10 @@ body {
   height: 50px;
 }
 
-.select_left .antd-Select-popover {
+.lookup-left {
+  max-width: 50% !important;
+}
+.lookup-left .antd-Select-popover {
   width: auto !important;
 }
 

package/dist/amis-object.cjs.js

@@ -108,18 +108,6 @@ function __generator(thisArg, body) {
     }
 }
 
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
 function __read(o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -3828,6 +3816,10 @@ async function getFieldsTemplate(fields, expand){
             if(___default.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                 displayFields.push(`${field.name}`);
             }
+        }else {
+            objectFieldName = field.name.split('.')[0];
+            fieldsName.push(objectFieldName);
+            displayFields.push(objectFieldName);
         }
     }
 
@@ -11103,6 +11095,7 @@ async function getTableApi(mainObject, fields, options){
     let valueField = mainObject.key_field || '_id';
     const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
+    api.url += "&objectName=${objectName}";//设计器上对象表格组件需要切换对象重新请求列表数据
     if(options.isRelated){
         api.url += "&recordId=${_master.recordId}";
     }
@@ -11432,12 +11425,18 @@ function getReadonlyFormAdaptor(object, fields, options){
     //     }
     // })
 
+    var fieldNames = ___default__namespace.map(fields, function(n){return n.name});
     return  `
     if(payload.data.data.length === 0){
         var isEditor = !!${options && options.isEditor};
         if(isEditor){
+            var fieldNames = ${JSON.stringify(fieldNames)};
+            var emptyDoc = {};//这里如果不把每个字段值设置为空的话，表单上会显示上一次表单上的字段值
+            fieldNames.forEach(function(n){
+                emptyDoc[n] = null;
+            });
             // 设计器中始终显示表单，有记录则显示第一条记录，没记录时显示为空表单
-            payload.data.data = [{}];
+            payload.data.data = [emptyDoc];
         }
         else{
             return {
@@ -16779,85 +16778,71 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
 });
 
 var getSchema = function (field, value, ctx) { return __awaiter(void 0, void 0, void 0, function () {
-    var refTo, leftName, options, refTo_1, refTo_1_1, item, refObject_1, e_1_1, refObject, rightSchema;
-    var e_1, _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var refTo, leftName, refObject, rightSchema;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 refTo = field.reference_to;
                 if (refTo && ___default.isFunction(refTo)) {
                     refTo = refTo();
                 }
                 leftName = "".concat(field.name, "__left");
-                options = [];
-                _b.label = 1;
-            case 1:
-                _b.trys.push([1, 6, 7, 8]);
-                refTo_1 = __values(refTo), refTo_1_1 = refTo_1.next();
-                _b.label = 2;
-            case 2:
-                if (!!refTo_1_1.done) return [3 /*break*/, 5];
-                item = refTo_1_1.value;
-                return [4 /*yield*/, getUISchema(item, false)];
-            case 3:
-                refObject_1 = _b.sent();
-                options.push({
-                    label: refObject_1.label,
-                    value: item,
-                    icon: refObject_1.icon
-                });
-                _b.label = 4;
-            case 4:
-                refTo_1_1 = refTo_1.next();
-                return [3 /*break*/, 2];
-            case 5: return [3 /*break*/, 8];
-            case 6:
-                e_1_1 = _b.sent();
-                e_1 = { error: e_1_1 };
-                return [3 /*break*/, 8];
-            case 7:
-                try {
-                    if (refTo_1_1 && !refTo_1_1.done && (_a = refTo_1.return)) _a.call(refTo_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-                return [7 /*endfinally*/];
-            case 8:
+                // const options = [];
+                // for (const item of refTo) {
+                //   const refObject = await getUISchema(item, false);
+                //   options.push({
+                //       label: refObject.label,
+                //       value: item,
+                //       icon: refObject.icon
+                //   });
+                // }
                 // console.log(`getSchema refTo`, refTo);
                 // console.log(`getSchema options`, options);
                 // console.log(`getSchema value=========>`, value);
                 if (!value || !value.o) {
                     value = {
-                        o: options[0].value,
+                        o: refTo[0],
                         ids: []
                     };
                 }
                 return [4 /*yield*/, getUISchema(value.o, false)];
-            case 9:
-                refObject = _b.sent();
+            case 1:
+                refObject = _a.sent();
                 rightSchema = null;
-                if (!(refObject.enable_enhanced_lookup == true)) return [3 /*break*/, 11];
+                if (!(refObject.enable_enhanced_lookup == true)) return [3 /*break*/, 3];
                 return [4 /*yield*/, lookupToAmisPicker(Object.assign({}, field, { reference_to: value.o }), false, ctx)];
-            case 10:
-                rightSchema = _b.sent();
-                return [3 /*break*/, 13];
-            case 11:
+            case 2:
+                rightSchema = _a.sent();
+                return [3 /*break*/, 5];
+            case 3:
                 if (!ctx) {
                     ctx = {};
                 }
                 ctx.isRefToMutiple = ___default.isArray(refTo);
                 return [4 /*yield*/, lookupToAmisSelect(Object.assign({}, field, { reference_to: value.o }), false, ctx)];
-            case 12:
-                rightSchema = _b.sent();
-                _b.label = 13;
-            case 13: return [2 /*return*/, {
+            case 4:
+                rightSchema = _a.sent();
+                _a.label = 5;
+            case 5: return [2 /*return*/, {
                     "type": "input-group",
                     "label": false,
                     "body": [
                         {
                             "type": "select",
-                            "inputClassName": "select_left",
+                            "inputClassName": "lookup-left",
                             "name": leftName,
-                            "options": options,
+                            // "options": options,
+                            "source": {
+                                "method": "post",
+                                "url": "${context.rootUrl}/graphql",
+                                "data": {
+                                    "query": "{options:objects(filters: {__filters}, top: {__top}, sort: \"{__sort}\"){_id label:label value:name icon},count:objects__count(filters:{__filters})}"
+                                },
+                                "headers": {
+                                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                },
+                                "requestAdaptor": "\nvar filters = [\"name\",\"in\", ".concat(JSON.stringify(refTo), "]; \nvar top = ").concat(JSON.stringify(refTo), ".length;\n\nvar sort = \"\";\napi.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', top).replace('{__sort}', sort.trim());\nreturn api;"),
+                            },
                             "value": "".concat(value.o)
                         },
                         Object.assign({}, rightSchema, {
@@ -17402,7 +17387,8 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                                                 {
                                                     "type": "service",
                                                     "schemaApi": {
-                                                        "url": "${context.rootUrl}/graphql?listName=${listName}&display=${display}",
+                                                        // 这里url上加objectApiName属性是因为设计器中切换对象时不会变更列表视图界面，不可以用objectName=${objectName}使用作用域中objectName变量是因为设计器那边不会监听识别data变化来render组件
+                                                        "url": "${context.rootUrl}/graphql?objectName=" + objectApiName + "&listName=${listName}&display=${display}",
                                                         "method": "post",
                                                         "messages": {},
                                                         "headers": {
@@ -17496,7 +17482,11 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
             case 1:
                 amisSchema = (_d.sent()).amisSchema;
                 amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);
+                if (___default.has(props, 'objectApiName')) {
+                    amisSchema.data.objectName = objectApiName;
+                }
                 amisSchema.className = "steedos-object-table h-full flex flex-col ".concat(className);
+                amisSchema.objectApiName = objectApiName; //设计器中切换对象时画布中显示的列未同步变更
                 // console.log(`AmisObjectTable===>amisSchema`, amisSchema)
                 // console.timeEnd('AmisObjectTable')
                 return [2 /*return*/, amisSchema];