@steedos-widgets/amis-object 1.1.4 → 1.2.0-beta.0

package/dist/amis-object.cjs.css

@@ -198,6 +198,13 @@ body {
     width: -webkit-fill-available;
 }
 
+
+/* 实现弹框中的crud中的inputTree高度满屏，目前选人控件的左侧树样式 */
+.amis-scope .antd-Modal-body .antd-Crud .antd-Table .antd-Tree{
+    max-height: unset;
+    overflow: unset;
+}
+
 .ant-dropdown-menu {
     border: 1px solid #e5e5e5;
     border-radius: 0.25rem;
@@ -993,6 +1000,10 @@ body {
 #main {
     overflow: hidden;
 }
+
+#steedosPageRoot{
+    overflow: auto;
+}
 .steedos-listview .is-loading .antd-Table-contentWrap {
   height: 50px;
 }

package/dist/amis-object.cjs.js

@@ -3779,7 +3779,7 @@ function getExportApiRequestAdaptorScript(){
   `
 }
 
-function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false} = {}){
+function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems} = {}){
   const isMobile = window.innerWidth < 768;
   if(isMobile){
     showDisplayAs = false;
@@ -3838,6 +3838,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
   }else {
     return [
       // "filter-toggler",
+      ...(headerToolbarItems || []),
       "bulkActions",
       {
         "type": "columns-toggler",
@@ -4192,6 +4193,89 @@ const getReferenceTo = async (field)=>{
     }
 };
 
+function getLookupSapceUserTreeSchema(){
+    const tree = [{
+        "type": "input-tree",
+        "className": "",
+        "id": "u:7fd77b7915b0",
+        "source": {
+          "method": "post",
+          "url": "${context.rootUrl}/graphql",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          },
+          "adaptor": "        const records = payload.data.options;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds) => {\n                if (!childrenIds) {\n                        return;\n                }\n                const children = _.filter(records, (record) => {\n                        return _.includes(childrenIds, record.value)\n                });\n                _.each(children, (item) => {\n                        if (item.children) {\n                                item.children = getChildren(records, item.children)\n                        }\n                })\n                return children;\n        }\n\n        const getRoot = (records) => {\n                for (var i = 0; i < records.length; i++){\n                        records[i].noParent = 0;\n                        if (!!records[i].parent) {\n                                biaozhi = 1\n                                for (var j = 0; j < records.length; j++){\n                                        if (records[i].parent == records[j].value)\n                                                biaozhi = 0;\n                                }\n                                if (biaozhi == 1) records[i].noParent = 1;\n                        } else records[i].noParent = 1;\n                }\n        }\n        getRoot(records);\n        console.log(records)\n\n        _.each(records, (record) => {\n                if (record.noParent ==1) {\n                        treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));\n                }\n        });\n        console.log(treeRecords)\n\n        payload.data.options = treeRecords;\n        return payload;\n    ",
+          "requestAdaptor": "\n    ",
+          "data": {
+            "query": "{options:organizations(filters:[\"hidden\", \"!=\", true],sort:\"sort_no desc\"){value:_id label:name,parent,children}}"
+          },
+          "messages": {
+          }
+        },
+        "onEvent": {
+          "change": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": `
+                debugger;
+                const scope = event.context.scoped;
+                //TODO: 将form中的value一同加入筛选内
+                // var filterForm = scope.parent.parent.getComponents().find(function(n){
+                //     return n.props.type === "form";
+                //   });
+                // var filterFormValues = filterForm.getValues();
+                filterFormValues={
+                    "__searchable__organizations_parents":event.data.value.value
+                }
+                var listView = scope.parent.getComponents().find(function(n){
+                  return n.props.type === "crud";
+                });
+                const removedValues = {};
+                // for(var k in filterFormValues){
+                    //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
+                    //     removedValues[k] = "";
+                    //   }
+                    // }
+                listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
+              `
+              }
+            ]
+          }
+        },
+        "label": "",
+        "name": "organizations",
+        "multiple": false,
+        "joinValues": false,
+        "clearValueOnHidden": false,
+        "fieldName": "organizations",
+        "hideRoot": true,
+        "initiallyOpen": false,
+        "extractValue": true,
+        "onlyChildren": true,
+        "treeContainerClassName": "no-border",
+        "showIcon": false,
+        "enableNodePath": false,
+        "autoCheckChildren": false,
+        "searchable": true,
+        "searchConfig": {
+          "sticky": true
+        },
+        "unfoldedLevel": 2,
+        "style": {
+          "max-height": "100%",
+          "position": "absolute",
+          "left": "-190px",
+          "width": "190px",
+          "bottom": 0,
+          "top": "0",
+          "overflow": "auto",
+          "min-height":"300px"
+        },
+        "originPosition": "left-top"
+    }];
+    return tree;
+}
 
 async function lookupToAmisPicker(field, readonly, ctx){
     let referenceTo = await getReferenceTo(field);
@@ -4434,7 +4518,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
             ...ctx
         });
 
-        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, ctx.formFactor);
+        var headerToolbarItems = [];
+        const isMobile = window.innerWidth < 768;
+        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
+             headerToolbarItems = getLookupSapceUserTreeSchema();
+             pickerSchema["style"] = {
+                "margin-left":"200px",
+                "min-height": "300px"
+             };
+        }
+        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, ctx.formFactor, { headerToolbarItems });
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         if (isAllowCreate) {
             const new_button = await getSchema$4(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
@@ -4442,15 +4535,18 @@ async function lookupToAmisPicker(field, readonly, ctx){
             pickerSchema.headerToolbar.push(new_button);
         }
         pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
-        if(ctx.filterVisible !== false){
-            let filterLoopCount = ctx.filterLoopCount || 0;
-            filterLoopCount++;
-            // 可以传入filterVisible为false防止死循环
-            pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
-                isLookup: true,
-                ...ctx,
-                filterLoopCount,
-            });
+        //TODO: 等待放大镜bug修复,if会去掉，始终显示放大镜
+        if(referenceTo.objectName != "space_users" || field.reference_to_field != "user"){
+            if (ctx.filterVisible !== false) {
+                let filterLoopCount = ctx.filterLoopCount || 0;
+                filterLoopCount++;
+                // 可以传入filterVisible为false防止死循环
+                pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
+                    isLookup: true,
+                    ...ctx,
+                    filterLoopCount,
+                });
+            }
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
             "&": "$$",
@@ -4698,7 +4794,7 @@ async function lookupToAmis(field, readonly, ctx){
         if(ctx.idsDependOn || field.amis){
             return await lookupToAmisIdsPicker(field, readonly, ctx);
         }
-        return await lookupToAmisSelectUser(field, readonly, ctx);
+        // return await lookupToAmisSelectUser(field, readonly, ctx);
     }
 
     const refObject = await getUISchema(referenceTo.objectName);
@@ -5334,13 +5430,19 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'percent':
-            //TODO
-            convertData = {
-                type: getAmisStaticFieldType('number', readonly),
-                min: field.min,
-                max: field.max,
-                precision: field.scale
-            };
+            if(readonly){
+                convertData = {
+                    type: 'static-tpl',
+                    tpl: getUiFieldTpl(field)
+                };
+            }else {
+                convertData = {
+                    type: getAmisStaticFieldType('number', readonly),
+                    min: field.min,
+                    max: field.max,
+                    precision: field.scale
+                };
+            }
             break;
         case 'password':
             convertData = {
@@ -5382,12 +5484,18 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
         case 'formula':
             if(readonly){
-                convertData.type = getAmisStaticFieldType(field.data_type, readonly);
+                convertData = {
+                    type: 'static-tpl',
+                    tpl: getUiFieldTpl(field)
+                };
             }
             break;
         case 'summary':
             if(readonly){
-                convertData.type = getAmisStaticFieldType(field.data_type, readonly);
+                convertData = {
+                    type: 'static-tpl',
+                    tpl: getUiFieldTpl(field)
+                };
             }
             break;
         case 'code':
@@ -6100,7 +6208,11 @@ async function getObjectCRUD(objectSchema, fields, options){
       }
     }
 
-    bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs, hiddenCount: options.queryCount === false});
+    bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {
+      showDisplayAs, 
+      hiddenCount: options.queryCount === false, 
+      headerToolbarItems: options.headerToolbarItems
+    });
 
 
     let body = null;
@@ -8334,7 +8446,8 @@ async function getListSchema(
         "sort": sort,
         "ctx": ctx,
         "requestAdaptor": listView.requestAdaptor,  
-        "adaptor": listView.adaptor
+        "adaptor": listView.adaptor,
+        "headerToolbarItems": ctx.headerToolbarItems
     };
     return {
         uiSchema,
@@ -8395,6 +8508,7 @@ async function getTableSchema(
         ...ctx,
         filter: ctx.filters,
         sort,
+        headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
     });
     return {
@@ -11478,6 +11592,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getListViewItemButtons: getListViewItemButtons,
     getListViewSort: getListViewSort,
     getListviewInitSchema: getListviewInitSchema,
+    getLookupSapceUserTreeSchema: getLookupSapceUserTreeSchema,
     getNotifications: getNotifications,
     getObjectDetailButtons: getObjectDetailButtons,
     getObjectDetailMoreButtons: getObjectDetailMoreButtons,
@@ -11982,11 +12097,11 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
 }); };
 
 var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, top, perPage, _a, showHeader, headerSchema, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, objectUiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, schema, amisSchema, uiSchema, body, firstLineSchema, serviceData;
+    var $schema, top, perPage, _a, showHeader, headerSchema, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, headerToolbarItems, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, objectUiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, schema, amisSchema, uiSchema, body, firstLineSchema, serviceData;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
-                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, headerSchema = props.headerSchema, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable;
+                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, headerSchema = props.headerSchema, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable, headerToolbarItems = props.headerToolbarItems;
                 ctx = props.ctx;
                 listName = (defaultData === null || defaultData === void 0 ? void 0 : defaultData.listName) || (data === null || data === void 0 ? void 0 : data.listName) || (props === null || props === void 0 ? void 0 : props.listName);
                 defaults = {};
@@ -12067,7 +12182,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 }
                 amisSchemaData = Object.assign({}, data, defaultData);
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
-                return [4 /*yield*/, getListSchema(amisSchemaData.appId, objectApiName, listName, __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: true, showDisplayAs: showDisplayAs, displayAs: displayAs }))];
+                return [4 /*yield*/, getListSchema(amisSchemaData.appId, objectApiName, listName, __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: true, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems }))];
             case 2:
                 schema = (_e.sent());
                 amisSchema = schema.amisSchema;
@@ -12140,11 +12255,11 @@ function getTableColumns(columns, includedFields, fieldsExtend) {
     return tableColumns;
 }
 var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
+    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, headerToolbarItems, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.formFactor, formFactor = _a === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _a, _b = props.className, className = _b === void 0 ? "" : _b, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
+                $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.formFactor, formFactor = _a === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _a, _b = props.className, className = _b === void 0 ? "" : _b, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, headerToolbarItems = props.headerToolbarItems;
                 ctx = props.ctx;
                 if (!ctx) {
                     ctx = {};
@@ -12178,7 +12293,7 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                 appId = (data === null || data === void 0 ? void 0 : data.appId) || (defaultData === null || defaultData === void 0 ? void 0 : defaultData.appId);
                 // ctx中值为undefined的属性不能保留，否则会导致 filters等被覆盖。
                 ctx = ___default.pickBy(ctx, function (value) { return value !== undefined; });
-                return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor }))];
+                return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor, headerToolbarItems: headerToolbarItems }))];
             case 1:
                 amisSchema = (_c.sent()).amisSchema;
                 amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);