@steedos/service-plugin-amis 2.2.51-beta.2 → 2.2.51-beta.6

package/main/default/client/amis.render.client.js

@@ -18,9 +18,32 @@
     };
     
     try {
+        window['attrAccept'] = function (file, acceptedFiles) {
+            if (file && acceptedFiles) {
+              var acceptedFilesArray = Array.isArray(acceptedFiles) ? acceptedFiles : acceptedFiles.split(',');
+              var fileName = file.name || '';
+              var mimeType = (file.type || '').toLowerCase();
+              var baseMimeType = mimeType.replace(/\/.*$/, '');
+              return acceptedFilesArray.some(function (type) {
+                var validType = type.trim().toLowerCase();
+          
+                if (validType.charAt(0) === '.') {
+                  return fileName.toLowerCase().endsWith(validType);
+                } else if (validType.endsWith('/*')) {
+                  // This is something like a image/* mime type
+                  return baseMimeType === validType.replace(/\/.*$/, '');
+                }
+          
+                return mimeType === validType;
+              });
+            }
+          
+            return true;
+          }
+
         // 加载Amis SDK: 如果直接放到body中会导致meteor 编译后的 cordova.js 加载报错
         let amisSDKScript = document.createElement("script");
-        amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/@steedos-ui/amis/dist/amis-sdk.umd.min.js'));
+        amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/@steedos-ui/amis@2.2.26/dist/amis-sdk.umd.min.js'));
         document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
     } catch (error) {
         console.error(error)

package/main/default/services/metadata/listviews.service.js

@@ -288,6 +288,21 @@ module.exports = {
                                     operators: getFieldOperators(field.type)
                                 });
                                 break;
+                            case 'boolean':
+                            case 'toggle':
+                                fields.push({
+                                    label: field.label,
+                                    type: "select",
+                                    name: field.name,
+                                    options: [
+                                        {label: "是", value: true},
+                                        {label: "否", value: false}
+                                    ],
+                                    operators: [
+                                      "equal",
+                                      "not_equal"
+                                    ]
+                                  });
                             default:
                                 break;
                         }

package/main/default/services/utils/fields/lookup.js

@@ -49,7 +49,16 @@ function lookupToAmisPicker(field, readonly){
     const tableFields = [referenceTo.valueField];
     let i = 0;
     const searchableFields = [];
-    _.each(refObjectConfig.fields,function(field){
+
+
+    const fieldsArr = [];
+	_.each(refObjectConfig.fields , (field, field_name)=>{
+		if(!_.has(field, "name")){
+			field.name = field_name
+        }
+		fieldsArr.push(field)
+    })
+    _.each(_.sortBy(fieldsArr, "sort_no"),function(field){
         if(i < 5){
             if(!_.find(tableFields, function(f){
                 return f.name === field.name
@@ -69,7 +78,9 @@ function lookupToAmisPicker(field, readonly){
     };
 
     _.each(tableFields, (tableField)=>{
-        fields[tableField.name] = tableField;
+        if(!tableField.hidden){
+            fields[tableField.name] = tableField;
+        }
     });
 
     const source = getApi({
@@ -121,7 +132,8 @@ function lookupToAmisPicker(field, readonly){
         pickerSchema: Table.getTableSchema(tableFields, {
             top:  top
         }),
-        joinValues: false
+        joinValues: false,
+        extractValue: true
     }
     if(field.multiple){
         data.multiple = true
@@ -213,7 +225,7 @@ function getApi(object, recordId, fields, options){
     return {
         method: "post",
         url: graphql.getApi(),
-        data: graphql.getFindQuery(object, recordId, fields, Object.assign(options, {expand: false}))
+        data: graphql.getFindQuery(object, recordId, fields, Object.assign(options, {expand: true}))
     }
 }
 

package/main/default/services/utils/fields/table.js

@@ -33,7 +33,7 @@ function getOperation(fields){
 function getDetailColumn(){}
 
 function getTableColumns(fields){
-    const columns = [{name: '_index',type: 'text', width: 32}];
+    const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
     _.each(fields, function(field){
 
         const tpl = Tpl.getFieldTpl(field);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.51-beta.2",
+  "version": "2.2.51-beta.6",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c324c40fa8facd3bf73a51e8c417293a9349f9fb"
+  "gitHead": "62d750b1f5199fe8f774ea2dcf30e0e8b393737a"
 }