@steedos-widgets/amis-object 1.2.13 → 1.2.14

package/dist/amis-object.umd.js

@@ -5877,6 +5877,10 @@ else{
               };
         }
 
+        if(field.pickerSchema){
+            pickerSchema = Object.assign({}, pickerSchema, field.pickerSchema);
+        }
+
         const data = {
             type: getAmisStaticFieldType('picker', readonly),
             labelField: referenceTo.labelField.name,
@@ -7507,12 +7511,12 @@ else{
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-05-26 16:02:08
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-03-13 16:01:40
+     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+     * @LastEditTime: 2023-06-02 16:54:41
      * @Description: 
      */
 
-    const getFieldSchemaArray = (formFields)=>{
+    const getFieldSchemaArray = (formFields) => {
       let fieldSchemaArray = [];
       fieldSchemaArray.length = 0;
 
@@ -7525,10 +7529,10 @@ else{
           // field.group = field.label
           field.is_wide = true;
         }
-        
-        if (!isObjectField){
-          if(!field.hidden){
-              fieldSchemaArray.push(Object.assign({name: fieldName}, field, {permission: {allowEdit: true}}));
+
+        if (!isObjectField) {
+          if (!field.hidden) {
+            fieldSchemaArray.push(Object.assign({ name: fieldName }, field, { permission: { allowEdit: true } }));
           }
         }
       });
@@ -7536,89 +7540,104 @@ else{
     };
 
     const getSection = async (formFields, permissionFields, fieldSchemaArray, sectionName, ctx) => {
+      if (!ctx) {
+        ctx = {};
+      }
       const sectionFields = ___default__namespace.filter(fieldSchemaArray, { 'group': sectionName });
-      if(sectionFields.length == ___default__namespace.filter(sectionFields, ['hidden', true]).length){
-        return ;
+      if (sectionFields.length == ___default__namespace.filter(sectionFields, ['hidden', true]).length) {
+        return;
       }
 
       const fieldSetBody = [];
 
       for (const perField of sectionFields) {
         let field = perField;
-          if(perField.type === 'grid'){
-              field = await getGridFieldSubFields(perField, formFields);
-              // console.log(`perField.type grid ===> field`, field)
-          }else if(perField.type === 'object'){
-              field = await getObjectFieldSubFields(perField, formFields);
-              // console.log(`perField.type object ===> field`, field)
-          }
-          if(field.name.indexOf(".") < 0){
-              ctx.__formFields = formFields;
-              const amisField = await convertSFieldToAmisField(field, field.readonly, ctx);
-              // console.log(`${field.name} amisField`, field, amisField)
-              if(amisField){
-                  fieldSetBody.push(amisField);
-              }
+        if (perField.type === 'grid') {
+          field = await getGridFieldSubFields(perField, formFields);
+          // console.log(`perField.type grid ===> field`, field)
+        } else if (perField.type === 'object') {
+          field = await getObjectFieldSubFields(perField, formFields);
+          // console.log(`perField.type object ===> field`, field)
+        }
+        if (field.name.indexOf(".") < 0) {
+          ctx.__formFields = formFields;
+          const amisField = await convertSFieldToAmisField(field, field.readonly, ctx);
+          // console.log(`${field.name} amisField`, field, amisField)
+          if (amisField) {
+            fieldSetBody.push(amisField);
           }
+        }
       }
 
       // fieldSet 已支持显隐控制
-      const sectionFieldsVisibleOn = ___default__namespace.map(___default__namespace.compact(___default__namespace.map(fieldSetBody, 'visibleOn')) , (visibleOn)=>{
+      const sectionFieldsVisibleOn = ___default__namespace.map(___default__namespace.compact(___default__namespace.map(fieldSetBody, 'visibleOn')), (visibleOn) => {
         return visibleOn;
       });
-      const section = {
+
+      let section = {
         "type": "fieldSet",
         "title": sectionName,
         "collapsable": true,
         "body": fieldSetBody,
       };
-      if(sectionFieldsVisibleOn.length > 0 && fieldSetBody.length === sectionFieldsVisibleOn.length){
+
+      if (ctx.enableTabs) {
+        section = {
+          "title": sectionName,
+          "body": fieldSetBody,
+        };
+      }
+
+      if (sectionFieldsVisibleOn.length > 0 && fieldSetBody.length === sectionFieldsVisibleOn.length) {
         section.visibleOn = `${sectionFieldsVisibleOn.join(" || ")}`;
       }
       return section
     };
 
     const getSections = async (permissionFields, formFields, ctx) => {
+      if (!ctx) {
+        ctx = {};
+      }
       const fieldSchemaArray = getFieldSchemaArray(formFields);
       const _sections = ___default__namespace.groupBy(fieldSchemaArray, 'group');
       const sections = [];
-      var sectionHeaderVisibleOn=[];
+      var sectionVisibleOns = [];
       for (const key in _sections) {
         const section = await getSection(formFields, permissionFields, fieldSchemaArray, key, ctx);
-        if(section.body.length > 0){
-          if(section.visibleOn){
-            sectionHeaderVisibleOn.push(section.visibleOn);
+        if (section.body.length > 0) {
+          if (section.visibleOn) {
+            sectionVisibleOns.push(section.visibleOn);
+          }
+          else {
+            sectionVisibleOns.push("true");
           }
           sections.push(section);
         }
       }
       /*
       为了实现只有一个分组时隐藏该分组标题，需要分三种情况(分组如果没有visibleon属性就代表一定显示，有visibleon需要进行判断)
-      1.所有分组中只有一个分组没有visibleon，还需要判断其他有visibleon的分组是否显示，只有其他都不显示时，才需要隐藏标题；反之，有任何一个显示，就不需要隐藏标题
-      2.所有分组都有visibleon
-        2.1 当前分组为隐藏时，标题就设置为隐藏
-        2.2 当前分组为显示时，其他分组只要有一个是显示，就显示该分组标题
-        2.3 当前分组为显示时，其他分组都隐藏，就隐藏该分组标题
-      3.所有分组中有两个以上的分组没有visibleon（这种情况不用处理）
+      1 当前分组为隐藏时，标题就设置为隐藏
+      2 当前分组为显示时，其他分组只要有一个是显示，就显示该分组标题
+      3 当前分组为显示时，其他分组都隐藏，就隐藏该分组标题
       */
-     if(ctx.mode == "edit"){
-       if (sections.length - sectionHeaderVisibleOn.length == 1) {
-         sections.forEach((section) => {
-           section.headingClassName = {
-             "hidden": `!(${sectionHeaderVisibleOn.join(" || ") || 'false'})`
-           };
-         });
-       } else if (sections.length == sectionHeaderVisibleOn.length) {
-         sections.forEach((section, index) => {
-           var tempSectionHeaderVisibleOn = sectionHeaderVisibleOn.slice();
-           tempSectionHeaderVisibleOn.splice(index, 1);
-           section.headingClassName = {
-             "hidden": `!((${tempSectionHeaderVisibleOn.join(" || ") || 'false'}) && ${sectionHeaderVisibleOn[index]})`
-           };
-         });
-       }
-     }
-      
+      sections.forEach((section, index) => {
+        var tempSectionVisibleOns = sectionVisibleOns.slice();
+        tempSectionVisibleOns.splice(index, 1);
+        section.headingClassName = {
+          "hidden": `!((${tempSectionVisibleOns.join(" || ") || 'false'}) && ${sectionVisibleOns[index]})`
+        };
+      });
+
+      if (ctx.enableTabs) {
+        return [
+          {
+            "type": "tabs",
+            "tabs": sections,
+            "tabsMode": ctx.tabsMode
+          }
+        ]
+      }
+
       return sections;
     };
 
@@ -13708,11 +13727,11 @@ else{
     };
 
     var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var $schema, recordId, defaultData, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
+        var $schema, recordId, defaultData, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, layout = props.layout, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _a = props.excludedFields, excludedFields = _a === void 0 ? null : _a, _b = props.fields, fields = _b === void 0 ? null : _b, _c = props.className, className = _c === void 0 ? "" : _c, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor;
+                    $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, layout = props.layout, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _a = props.excludedFields, excludedFields = _a === void 0 ? null : _a, _b = props.fields, fields = _b === void 0 ? null : _b, _c = props.className, className = _c === void 0 ? "" : _c, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode;
                     objectApiName = props.objectApiName || "space_users";
                     schemaKeys = ___default.difference(___default.keys($schema), ["type", "mode", "layout", "defaultData"]);
                     formSchema = ___default.pick(props, schemaKeys);
@@ -13742,7 +13761,9 @@ else{
                             initApiRequestAdaptor: initApiRequestAdaptor,
                             initApiAdaptor: initApiAdaptor,
                             apiRequestAdaptor: apiRequestAdaptor,
-                            apiAdaptor: apiAdaptor
+                            apiAdaptor: apiAdaptor,
+                            enableTabs: enableTabs,
+                            tabsMode: tabsMode
                         }))];
                 case 1:
                     schema = _d.sent();