@steedos-widgets/amis-object 1.1.0-beta.1 → 1.1.0-beta.2

package/dist/amis/AmisInstanceDetail.d.ts

@@ -3,6 +3,7 @@ export declare const AmisInstanceDetail: (props: any) => Promise<{
     type: string;
     name: string;
     className: string;
+    bodyClassName: string;
     title: {
         type: string;
         label: string;
@@ -204,6 +205,9 @@ export declare const AmisInstanceDetail: (props: any) => Promise<{
                         size: string;
                         title: string;
                         className: string;
+                        headerClassName: string;
+                        bodyClassName: string;
+                        footerClassName: string;
                         drawerContainer: () => any;
                         body: {
                             type: string;
@@ -270,6 +274,7 @@ export declare const AmisInstanceDetail: (props: any) => Promise<{
                                         id: string;
                                         multiple: boolean;
                                         required: boolean;
+                                        selectFirst: boolean;
                                         source: {
                                             url: string;
                                             headers: {

package/dist/amis-object.cjs.css

@@ -193,6 +193,10 @@ body {
     height: calc(100% - 40px);
 }
 
+/*  nav下配置itemBadge属性后item不会自动撑开 */ 
+.antd-Nav-Menu-item-wrap .antd-Badge{
+    width: -webkit-fill-available;
+}
 
 .ant-dropdown-menu {
     border: 1px solid #e5e5e5;
@@ -384,6 +388,9 @@ body {
 .h-14 {
     height: 3.5rem
 }
+.h-full {
+    height: 100%
+}
 .h-5 {
     height: 1.25rem
 }
@@ -405,9 +412,6 @@ body {
 .h-7 {
     height: 1.75rem
 }
-.h-full {
-    height: 100%
-}
 .h-8 {
     height: 2rem
 }
@@ -651,6 +655,9 @@ body {
 .pt-2 {
     padding-top: 0.5rem
 }
+.pt-0 {
+    padding-top: 0px
+}
 .pl-1\.5 {
     padding-left: 0.375rem
 }
@@ -1134,6 +1141,9 @@ body.sidebar #sidebar {
   border: none !important;
   box-shadow: none !important;
 }
+.steedos-amis-instance-view .instance-form-view .antd-Form-static .antd-Form-control {
+  padding-left: 0.75rem !important;
+}
 .steedos-amis-instance-view .instance-form-view .antd-Number {
   background-color: transparent !important;
   border: none !important;
@@ -1162,17 +1172,12 @@ body.sidebar #sidebar {
 .steedos-amis-instance-view .form-control {
   background: no-repeat;
 }
-.steedos-amis-instance-view .instance-form-view tbody td {
-  border: 1px solid #000;
-  padding-left: 0.75rem !important;
-}
 .steedos-amis-instance-view .form-control .antd-Table-table thead th {
   background: transparent !important;
   border-color: #000;
 }
 .steedos-amis-instance-view .form-control .antd-Table-table tbody td {
   border: 1px solid #000;
-  padding-left: 0.75rem !important;
 }
 .steedos-amis-instance-view .form-control .antd-Table-table tbody td:last-child {
   border-right: none !important;

package/dist/amis-object.cjs.js

@@ -1288,7 +1288,7 @@ function getRecordPermissionsQuery(object, recordId, options){
 function getApi$2 (isMobile){
     if(isMobile);else {
         // return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/graphql"
-        return `\${context.rootUrl}/graphql`
+        return `\${context.rootUrl}/graphql?reload=\${additionalFilters}`
     }
 }
 
@@ -1435,10 +1435,18 @@ async function getSource$1(field, ctx) {
     }
     data.$value = `$${valueField}`;
     // data["&"] = "$$";
+
+    const fieldValue = ctx.value;
+
     const requestAdaptor = `
         var filters = [['parent', '=', null]];
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
         var defaultValue = api.data.$value;
+        var fieldValue = ${JSON.stringify(fieldValue)};
+        if(!defaultValue && fieldValue){
+            // 如果表单中没有字段值，则认字段上配置的value属性
+            defaultValue = fieldValue;
+        }
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
         var optionsFilters = [["user", optionsFiltersOp, []]];
         if (defaultValue) { 
@@ -1547,7 +1555,7 @@ async function getDeferApi$1(field, ctx) {
     `;
     return {
         "method": "post",
-        "url": getApi$2() + "?ref=${ref}&dep=${value}",
+        "url": getApi$2() + "&ref=${ref}&dep=${value}",
         "requestAdaptor": requestAdaptor,
         "adaptor": adaptor,
         "data": data,
@@ -1656,6 +1664,11 @@ async function getSelectUserSchema(field, readonly, ctx) {
         if (typeof amisSchema.searchable !== "boolean") {
             amisSchema.searchable = true;
         }
+
+        if(ctx.value){
+            amisSchema.value = ctx.value;
+        }
+
         const onEvent = field.onEvent;
         if (onEvent) {
             amisSchema.onEvent = onEvent;
@@ -4055,7 +4068,7 @@ async function getDeferApi(field, ctx) {
     `;
     return {
         "method": "post",
-        "url": getApi$2() + "?dep=${value}",
+        "url": getApi$2() + "&dep=${value}",
         "requestAdaptor": requestAdaptor,
         "adaptor": adaptor,
         "data": data,
@@ -4564,6 +4577,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         type: getAmisStaticFieldType('select', readonly),
         joinValues: false,
         extractValue: true,
+        clearable: true,
         // labelField: labelField,
         // valueField: valueField,
         source: apiInfo,
@@ -4758,6 +4772,14 @@ async function getIdsPickerSchema(field, readonly, ctx){
         data.extractValue = true;
     }
 
+    if(ctx.value){
+        data.value = ctx.value;
+    }
+
+    if(ctx.selectFirst != undefined){
+        data.selectFirst = ctx.selectFirst;
+    }
+
     if(readonly){
         data.tpl = await getLookupTpl(field, ctx);
     }
@@ -5732,15 +5754,17 @@ async function getEditFormInitApi(object, recordId, fields){
                 const dataKeys = _.keys(data);
                 const uiSchema = api.body.uiSchema;
                 const fieldKeys = uiSchema && _.keys(uiSchema.fields);
-                _.each(dataKeys, function(key){
-                    if(fieldKeys.indexOf(key)<0){
-                        delete data[key];
-                    }
-                })
 
                 if(data){
                     ${getScriptForAddUrlPrefixForImgFields(fields)}
                     ${getScriptForRewriteValueForFileFields(fields)}
+
+                    _.each(dataKeys, function(key){
+                        if(fieldKeys.indexOf(key)<0){
+                            delete data[key];
+                        }
+                    })
+                    
                     //初始化接口返回的字段移除字段值为null的字段
                     for (key in data){
                         if(data[key] === null){
@@ -6821,6 +6845,10 @@ async function getTableApi(mainObject, fields, options){
 
         if(!_.isEmpty(systemFilters)){
             filters = systemFilters;
+        };
+
+        if(api.data.$self.additionalFilters){
+            userFilters.push(api.data.$self.additionalFilters)
         }
 
         if(!_.isEmpty(userFilters)){
@@ -9341,6 +9369,7 @@ const getNextStepInput = async (instance) => {
             id: "u:next_step",
             multiple: false,
             required: true,
+            selectFirst: true,
             "source": {
               "url": "${context.rootUrl}/api/workflow/v2/nextStep?judge=${new_judge}",
               "headers": {
@@ -9368,20 +9397,7 @@ const getNextStepInput = async (instance) => {
                 "judge": "${new_judge}",
               }
             },
-            // "labelField": "name",
-            // "valueField": "_id",
             "onEvent": {
-              // "change": {
-              //   "weight": 0,
-              //   "actions": [
-              //     {
-              //       "componentId": "u:next_users",
-              //       "args": {
-              //       },
-              //       "actionType": "reload"
-              //     }
-              //   ]
-              // },
               "change": {
                 "weight": 0,
                 "actions": [
@@ -9395,7 +9411,6 @@ const getNextStepInput = async (instance) => {
                     "actionType": "setValue"
                   },
                   {
-                    // "componentId": "u:next_step",
                     "args": {
                       next_step: "${event.data.value}",
                     },
@@ -9404,7 +9419,6 @@ const getNextStepInput = async (instance) => {
                   },
                 ]
               }
-              
             }
           },
         ],
@@ -9679,6 +9693,9 @@ const getApprovalDrawerSchema = async (instance) => {
     size: "sm",
     title: `${instance.step.name}`,
     className: "approval-drawer absolute",
+    headerClassName: 'p-2',
+    bodyClassName: 'p-2',
+    footerClassName: 'p-2 pt-0',
     drawerContainer: ()=>{
       return window.$(".antd-Page-content",window.$(".steedos-instance-wrapper"))[0];
     },
@@ -10032,7 +10049,7 @@ const getInstanceApprovalHistory = async ()=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-07 16:20:45
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-18 17:29:01
+ * @LastEditTime: 2023-03-22 14:43:18
  * @Description:
  */
 
@@ -10745,6 +10762,7 @@ const getFlowFormSchema = async (instance, box) => {
     type: "page",
     name: "instancePage",
     className: "steedos-amis-instance-view",
+    bodyClassName: "overflow-y-auto h-full",
     "title": {
       "type": "steedos-record-detail-header",
       "label": "标题面板",
@@ -12114,15 +12132,15 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-12-08 10:32:17
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-07 12:40:53
+ * @LastEditTime: 2023-03-22 15:41:38
  * @Description:
  */
 var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var appId, _a, objectApiName, recordId, onEvent, schema, recordDetailData;
+    var className, appId, _a, objectApiName, recordId, onEvent, schema, recordDetailData;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, recordId = props.recordId, onEvent = props.onEvent, props.defaultData;
+                className = props.className, props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, recordId = props.recordId, onEvent = props.onEvent, props.defaultData;
                 return [4 /*yield*/, getRecordDetailSchema(objectApiName, appId, { onEvent: onEvent })];
             case 1:
                 schema = (_b.sent()).amisSchema;
@@ -12131,6 +12149,7 @@ var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                     recordDetailData.recordId = recordId;
                 }
                 schema.data = Object.assign({}, schema.data, recordDetailData);
+                schema.className = className;
                 return [2 /*return*/, schema];
         }
     });
@@ -12217,37 +12236,40 @@ var AmisRecordDetailRelatedLists = function (props) { return __awaiter(void 0, v
 }); };
 
 var AmisSelectUser = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, ids, idsTrackOn, _a, readonly, _b, ctx, amisSchema, steedosField, error_1;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var $schema, ids, idsTrackOn, _a, readonly, _b, selectFirst, amis, _c, ctx, value, amisSchema, steedosField, options, error_1;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                console.log("AmisSelectUser props", props);
-                $schema = props.$schema, props.data, ids = props.ids, idsTrackOn = props.idsTrackOn, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b;
-                _c.label = 1;
+                $schema = props.$schema, props.data, ids = props.ids, idsTrackOn = props.idsTrackOn, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.selectFirst, selectFirst = _b === void 0 ? false : _b, amis = props.amis, _c = props.ctx, ctx = _c === void 0 ? {} : _c;
+                value = $schema.value;
+                _d.label = 1;
             case 1:
-                _c.trys.push([1, 3, , 4]);
+                _d.trys.push([1, 3, , 4]);
                 steedosField = {
                     type: "lookup",
                     reference_to: "users",
                     name: $schema.name,
+                    label: $schema.label,
                     multiple: $schema.multiple,
                     required: $schema.required,
                     searchable: $schema.searchable,
                     onEvent: $schema.onEvent,
-                    filters: $schema.filters
+                    filters: $schema.filters,
+                    amis: amis
                 };
-                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, Object.assign.apply(Object, __spreadArray(__spreadArray([{}], __read(ctx), false), [{ ids: ids, idsTrackOn: idsTrackOn }], false)))];
+                options = Object.assign.apply(Object, __spreadArray(__spreadArray([{}], __read(ctx), false), [{ ids: ids, idsTrackOn: idsTrackOn, selectFirst: selectFirst }], false));
+                if (value) {
+                    options.value = value;
+                }
+                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, options)];
             case 2:
-                amisSchema = _c.sent();
+                amisSchema = _d.sent();
                 return [3 /*break*/, 4];
             case 3:
-                error_1 = _c.sent();
+                error_1 = _d.sent();
                 console.log("error", error_1);
                 return [3 /*break*/, 4];
-            case 4:
-                amisSchema.name = $schema.name;
-                amisSchema.label = $schema.label;
-                return [2 /*return*/, amisSchema];
+            case 4: return [2 /*return*/, amisSchema];
         }
     });
 }); };
@@ -12587,7 +12609,7 @@ var AmisAppMenu = function (props) { return __awaiter(void 0, void 0, void 0, fu
                 "source": {
                     "method": "get",
                     "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus"),
-                    "adaptor": "\n                try {\n                    const data = { nav: [] };\n                    const stacked = ".concat(stacked, ";\n                    const showIcon = ").concat(showIcon, ";\n                    const selectedId = '").concat(selectedId, "';\n                    _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                    if (groupName === 'undefined') {\n                        _.each(tabs, (tab) => {\n                        data.nav.push({\n                            \"label\": showIcon ? {\n                            type: 'tpl',\n                            tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                            } : tab.name,\n                            \"to\": tab.path,\n                            // active: selectedId === tab.id,\n                        })\n                        })\n                    } else {\n\n                        if(stacked){\n                            data.nav.push({\n                                \"label\": groupName,\n                                \"unfolded\": true,\n                                \"children\": _.map(tabs, (tab) => {\n                                    return {\n                                    \"label\": showIcon ? {\n                                        type: 'tpl',\n                                        tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                    }  : tab.name,\n                                    \"to\": tab.path,\n                                    // active: selectedId === tab.id,\n                                    }\n                                })\n                                })\n                        }else{\n                            _.each(tabs, (tab) => {\n                                data.nav.push({\n                                \"label\": showIcon ? {\n                                    type: 'tpl',\n                                    tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                } : tab.name,\n                                \"to\": tab.path,\n                                // active: selectedId === tab.id,\n                                });\n                            })\n                        }\n\n                        \n                    }\n                    });\n                    payload.data = data.nav;\n                } catch (error) {\n                    console.log(`error`, error)\n                }\n                return payload;\n          "),
+                    "adaptor": "\n                try {\n                    const data = { nav: [] };\n                    const stacked = ".concat(stacked, ";\n                    const showIcon = ").concat(showIcon, ";\n                    const selectedId = '").concat(selectedId, "';\n                    if(stacked){\n                        _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                            if (groupName === 'undefined' || groupName === '') {\n                                _.each(tabs, (tab) => {\n                                    data.nav.push({\n                                        \"label\": showIcon ? {\n                                        type: 'tpl',\n                                        tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                        } : tab.name,\n                                        \"to\": tab.path,\n                                        // active: selectedId === tab.id,\n                                    })\n                                })\n                            } else {\n                                data.nav.push({\n                                    \"label\": groupName,\n                                    \"unfolded\": true,\n                                    \"children\": _.map(tabs, (tab) => {\n                                        return {\n                                        \"label\": showIcon ? {\n                                            type: 'tpl',\n                                            tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                        }  : tab.name,\n                                        \"to\": tab.path,\n                                        // active: selectedId === tab.id,\n                                        }\n                                    })\n                                })   \n                            }\n                            });\n                    }else{\n                        _.each(payload.children, (tab)=>{\n                            data.nav.push({\n                            \"label\": showIcon ? {\n                                type: 'tpl',\n                                tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                            } : tab.name,\n                            \"to\": tab.path,\n                            // active: selectedId === tab.id,\n                            });\n                        })\n                    }\n                    \n                    payload.data = data.nav;\n                } catch (error) {\n                    console.log(`error`, error)\n                }\n                return payload;\n          "),
                     "headers": {
                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     },
@@ -13147,7 +13169,7 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                 return [2 /*return*/, {
                         type: 'service',
                         data: defData,
-                        "className": (displayAs === 'grid') ? '' : 'p-0 flex flex-1 overflow-hidden h-full',
+                        "className": (displayAs === 'grid') ? 'h-full' : 'p-0 flex flex-1 overflow-hidden h-full',
                         body: (displayAs === 'grid') ? ___default.defaultsDeep({ data: defData }, listSchema) : [
                             {
                                 "type": "wrapper",
@@ -13185,13 +13207,14 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                 recordPage = _a.sent();
                 recordSchema = recordPage ? JSON.parse(recordPage.schema) : {
                     "type": "wrapper",
-                    "className": "p-0 m-0 sm:m-3 flex-1",
+                    "className": "overflow-y-auto p-0 m-0 flex-1 h-full",
                     "name": "amis-".concat(appId, "-").concat(objectApiName, "-detail"),
                     "body": [
                         {
                             "type": "steedos-record-detail",
                             "recordId": "${recordId}",
                             "objectApiName": "${objectName}",
+                            className: "sm:m-3",
                             appId: appId,
                         }
                     ],
@@ -13219,7 +13242,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                             },
                             {
                                 "type": "wrapper",
-                                "className": 'p-0 flex-1 overflow-y-auto focus:outline-none lg:order-last',
+                                "className": 'p-0 flex-1 focus:outline-none lg:order-last h-full',
                                 "body": ___default.defaultsDeep({ data: defData }, recordSchema)
                             }
                         ]