@steedos-widgets/amis-object 1.2.30 → 1.2.31

package/dist/amis-object.cjs.css

@@ -238,6 +238,22 @@ body {
     }
 }
 
+/* TODO: amis3.2.0 .antd-Nav-Menu-item-link类中缺少flex，影响nav样式 */
+.antd-Nav-Menu-item-link{
+    display: flex;
+    align-items: center;
+}
+
+/* TODO: amis3.2.0 .antd-Nav类中多了background属性，影响nav样式 */
+.antd-Nav{
+    background-color: unset;
+}
+
+/* TODO: amis3.2.0 fieldset.antd-Collapse > legend类中多了background属性，影响分组样式 */
+fieldset.antd-Collapse > legend{
+    height: unset;
+}
+
 .ant-dropdown-menu {
     border: 1px solid #e5e5e5;
     border-radius: 0.25rem;
@@ -750,6 +766,9 @@ body {
 .p-3 {
     padding: 0.75rem
 }
+.\!p-2 {
+    padding: 0.5rem !important
+}
 .p-1 {
     padding: 0.25rem
 }
@@ -789,15 +808,15 @@ body {
 .pt-0 {
     padding-top: 0px
 }
-.pl-0 {
-    padding-left: 0px
-}
 .pl-1\.5 {
     padding-left: 0.375rem
 }
 .pl-1 {
     padding-left: 0.25rem
 }
+.pl-0 {
+    padding-left: 0px
+}
 .pr-4 {
     padding-right: 1rem
 }
@@ -1219,6 +1238,11 @@ body {
 .lookup-left .antd-Select-popover {
   width: auto !important;
 }
+.antd-InputGroup .antd-SelectControl.lookup-left .antd-Select {
+  border-right-width: 1px;
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
 
 @media (min-width: 767px) {
   .steedos-amis-form .antd-Collapse .antd-Form--normal,

package/dist/amis-object.cjs.js

@@ -3656,7 +3656,7 @@ function getNameTpl(field, ctx){
 
 function getRelatedFieldTpl(field, ctx){
     let tpl = '';
-    if(!field.reference_to && (field.optionsFunction || field._optionsFunction)){
+    if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
         if(field.isTableField){
             return `\${${field.name}}`
         }else {
@@ -8277,7 +8277,7 @@ const getSettingListviewToolbarButtonSchema = ()=>{
         "trigger": "click",
         "icon": "fa fa-cog",
         "tooltip": instance.t('frontend_button_listview_control_tooltip'),
-        "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
         "align": "right",
         "visibleOn": "${!isLookup}",
         "buttons": [
@@ -8321,7 +8321,7 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "type": "dropdown-button",
     "icon": "fa fa-table-columns",
     "tooltip": `${instance.t('frontend_display_as')} ${displayAsLabel}`,
-    "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
+    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
     "align": "right",
     "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
     "buttons": [ 
@@ -8983,6 +8983,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
+        if(${referenceTo?.objectName === "space_users"} && ${field.reference_to_field === "user"}){
+            if(filters.length > 0){
+                filters = [ ["user_accepted", "=", true], "and", filters ]
+            }else{
+                filters = [["user_accepted", "=", true]];
+            }
+        }
+
 
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
@@ -9315,6 +9323,14 @@ async function lookupToAmisSelect(field, readonly, ctx){
             filters.push(fieldFilters);
         }
 
+        if(${referenceTo?.objectName === "space_users"} && ${field.reference_to_field === "user"}){
+            if(filters.length > 0){
+                filters = [ ["user_accepted", "=", true], "and", filters ]
+            }else{
+                filters = [["user_accepted", "=", true]];
+            }
+        }
+
         const inFilterForm = ${ctx.inFilterForm};
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
@@ -9354,6 +9370,18 @@ async function lookupToAmisSelect(field, readonly, ctx){
         payload.data.options = options;
         return payload;
         `;
+    }else if(field.options){
+        apiInfo.adaptor = `
+        var options = ${JSON.stringify(field.options)}
+        if(api.data.$term){
+            options = _.filter(options, function(o) {
+                var label = o.label;
+                return label.toLowerCase().indexOf(api.data.$term.toLowerCase()) > -1;
+            });
+        }
+        payload.data.options = options;
+        return payload;
+        `;
     }
 
     const data = {
@@ -9433,11 +9461,6 @@ async function lookupToAmis(field, readonly, ctx){
             // ids人员点选模式
             return await lookupToAmisIdsPicker(field, readonly, ctx);
         }
-        if(!field.filters || field.filters.length == 0){
-            field.filters = [["user_accepted", "=", true]];
-        }else {
-            field.filters = [ ["user_accepted", "=", true], "and", field.filters ];
-        }
         // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
         // return await lookupToAmisSelectUser(field, readonly, ctx);
     }
@@ -9925,13 +9948,13 @@ function getSelectFieldOptions(field){
     ___default__namespace.each(field.options, (item)=>{
         switch (dataType) {
             case 'number':
-                options.push({label: item.label, value: Number(item.value)});
+                options.push({label: item.label, value: Number(item.value), icon: item.icon});
                 break;
             case 'text':
-                options.push({label: item.label, value: String(item.value)});
+                options.push({label: item.label, value: String(item.value), icon: item.icon});
                 break;
             case 'boolean':
-                options.push({label: item.label, value: item.value === 'false' ? false : true});
+                options.push({label: item.label, value: item.value === 'false' ? false : true, icon: item.icon});
                 break;
         }
     });
@@ -9993,6 +10016,17 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     labelField: 'label',
                     valueField: 'value'
                 };
+                const select_menuTpl = `<span class='flex items-center mt-0.5'>
+                    <span role='img' aria-label='smile' class='anticon anticon-smile'>
+                        <span class='slds-icon_container slds-icon-standard-\${REPLACE(icon,'_','-')}'>
+                            <svg class='slds-icon slds-icon_x-small' aria-hidden='true'>
+                                <use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#\${icon}'></use>
+                            </svg>
+                        </span> 
+                    </span>
+                    <span class='pl-1.5'>\${label}</span>
+                </span>`;
+                convertData.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
                 if(field.multiple){
                     convertData.multiple = true;
                     convertData.extractValue = true;
@@ -10724,7 +10758,7 @@ async function getTableColumns$1(fields, options){
                 type: "switch",
                 name: field.name,
                 label: field.label,
-                width: field.width,
+                width: field.width || defaultWidth,
                 toggled: field.toggled,
                 static: true,
                 className:"whitespace-nowrap",
@@ -10745,6 +10779,10 @@ async function getTableColumns$1(fields, options){
         }
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
+            let className = "";
+            if(field.wrap === false){
+                className += " whitespace-nowrap";
+            }
             columns.push(Object.assign({}, {
                 type: "mapping",
                 name: field.name,
@@ -10753,7 +10791,7 @@ async function getTableColumns$1(fields, options){
                 sortable: field.sortable,
                 width: field.width || defaultWidth,
                 toggled: field.toggled,
-                className:"whitespace-nowrap",
+                className,
                 static: true,
                 quickEdit: quickEditSchema
             }, field.amis, {name: field.name}));
@@ -11392,7 +11430,10 @@ async function getTableApi(mainObject, fields, options){
             if(item[key]){
                 if(field._optionsFunction){
                     const optionsFunction = eval("(" + field._optionsFunction+ ")")(item);
-                    item[key + '__label'] = _.map(_.filter(optionsFunction, function(option){return _.includes(item[key], option.value)}), 'label').join(' ');
+                    item[key + '__label'] = _.map(_.filter(optionsFunction, function(option){return item[key] == option.value}), 'label').join(' ');
+                }else if(field.options){
+                    const options = field.options;
+                    item[key + '__label'] = _.map(_.filter(options, function(option){return item[key] == option.value}), 'label').join(' ');
                 }
             }
         })
@@ -16835,6 +16876,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getRecordPageInitSchema: getRecordPageInitSchema,
     getRecordPermissions: getRecordPermissions,
     getRecordServiceSchema: getRecordServiceSchema,
+    getReferenceTo: getReferenceTo,
     getRelatedFieldValue: getRelatedFieldValue,
     getRelatedListSchema: getRelatedListSchema,
     getRelatedsCount: getRelatedsCount,
@@ -18908,12 +18950,13 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
 }); };
 
 var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var steedosField, field, _a, readonly, _b, ctx, config, $schema, schema, error_1;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var steedosField, field, _a, readonly, _b, ctx, config, $schema, fStatic, objectName, filters, valueFieldKey, labelFieldKey, referenceTo, referenceToField, value, _steedosField, referenceTo, referenceToField, schema, schema, error_1;
+    var _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 steedosField = null;
-                field = props.field, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b, config = props.config, $schema = props.$schema;
+                field = props.field, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b, config = props.config, $schema = props.$schema, fStatic = props.static;
                 // console.log(`AmisSteedosField`, props)
                 if ($schema.config && ___default.isString($schema.config)) {
                     $schema.config = JSON.parse($schema.config);
@@ -18934,19 +18977,66 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         steedosField = JSON.parse(field);
                     }
                 }
-                _c.label = 1;
+                _h.label = 1;
             case 1:
-                _c.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
+                _h.trys.push([1, 9, , 10]);
+                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 6];
+                objectName = void 0, filters = void 0, valueFieldKey = void 0, labelFieldKey = void 0;
+                if (!props.data[steedosField.name]) {
+                    return [2 /*return*/, {}];
+                }
+                if (!___default.isString(steedosField.reference_to)) return [3 /*break*/, 3];
+                return [4 /*yield*/, getReferenceTo(steedosField)];
             case 2:
-                schema = _c.sent();
-                // console.log(`schema`, schema)
-                return [2 /*return*/, schema];
+                referenceTo = _h.sent();
+                referenceToField = steedosField.reference_to_field || '_id';
+                objectName = referenceTo.objectName;
+                valueFieldKey = referenceTo && ((_c = referenceTo.valueField) === null || _c === void 0 ? void 0 : _c.name) || '_id';
+                labelFieldKey = referenceTo && ((_d = referenceTo.labelField) === null || _d === void 0 ? void 0 : _d.name) || 'name';
+                value = props.data[steedosField.name];
+                if (___default.isString(value)) {
+                    value = [value];
+                }
+                filters = [referenceToField, "in", value];
+                return [3 /*break*/, 5];
             case 3:
-                error_1 = _c.sent();
+                _steedosField = __assign$2(__assign$2({}, steedosField), { reference_to: props.data[steedosField.name].o });
+                return [4 /*yield*/, getReferenceTo(_steedosField)];
+            case 4:
+                referenceTo = _h.sent();
+                referenceToField = _steedosField.reference_to_field || '_id';
+                objectName = referenceTo.objectName;
+                valueFieldKey = referenceTo && ((_e = referenceTo.valueField) === null || _e === void 0 ? void 0 : _e.name) || '_id';
+                labelFieldKey = referenceTo && ((_f = referenceTo.labelField) === null || _f === void 0 ? void 0 : _f.name) || 'name';
+                filters = [referenceToField, "in", props.data[_steedosField.name].ids];
+                _h.label = 5;
+            case 5:
+                schema = Object.assign({}, {
+                    type: 'select',
+                    multiple: steedosField.multiple,
+                    name: steedosField.name,
+                    label: steedosField.label,
+                    static: true,
+                    className: (_g = steedosField.amis) === null || _g === void 0 ? void 0 : _g.className,
+                    source: {
+                        "method": "post",
+                        "url": "${context.rootUrl}/graphql",
+                        "requestAdaptor": "\n                        api.data = {\n                            query: '{options:".concat(objectName, "(filters: ").concat(JSON.stringify(filters), "){label: ").concat(labelFieldKey, ",value: ").concat(valueFieldKey, "}}'\n                        }\n                        return api;\n                    ")
+                    }
+                }, ___default.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
+                // console.log(`AmisSteedosField return schema`, schema)
+                return [2 /*return*/, schema];
+            case 6: return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
+            case 7:
+                schema = _h.sent();
+                // console.log(`AmisSteedosField return schema`, schema)
+                return [2 /*return*/, schema];
+            case 8: return [3 /*break*/, 10];
+            case 9:
+                error_1 = _h.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 4];
-            case 4: return [2 /*return*/, null];
+                return [3 /*break*/, 10];
+            case 10: return [2 /*return*/, null];
         }
     });
 }); };