@steedos-widgets/amis-object 3.6.0-beta.3 → 3.6.0-beta.4

package/dist/amis-object.cjs.css

@@ -1,7 +1,9 @@
 :root {
     --body-bg: #f9fafb;
     --Page-main-bg: transparent;
+    --Form-mode-default-labelGap: 2px;
     --Form-item-fontSize: 12px;
+    --Form-item-fontColor: rgb(68, 68, 68);
     --Form-fontSize: 14px;
     --Form-selectValue-fontSize: 14px;
     --Form-item-gap: 0.75rem;
@@ -252,6 +254,7 @@ fieldset.antd-Collapse > legend.antd-Collapse-header > .antd-Collapse-arrow:befo
 /* TODO: amis3.2.0 fieldset.antd-Collapse > legend类中多了background属性，影响分组样式 */
 fieldset.antd-Collapse > legend{
     height: unset;
+    width: unset;
 }
 
 /* crud中的快速搜索框样式改成与按钮风格统一的边框 */
@@ -476,9 +479,6 @@ fieldset.antd-Collapse > legend{
 .m-0 {
     margin: 0px
 }
-.m-1 {
-    margin: 0.25rem
-}
 .m-2 {
     margin: 0.5rem
 }
@@ -1159,13 +1159,6 @@ fieldset.antd-Collapse > legend{
     .sm\:p-3 {
         padding: 0.75rem
     }
-    .sm\:px-3 {
-        padding-left: 0.75rem;
-        padding-right: 0.75rem
-    }
-    .sm\:pt-3 {
-        padding-top: 0.75rem
-    }
     .sm\:shadow {
         --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
         --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
@@ -1558,6 +1551,9 @@ fieldset.antd-Collapse > legend{
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.antd-Crud .antd-Table tbody td > .antd-Form-static {
+  display: inline;
+}
 
 
 .steedos-dropdown-button-overlay .ant-dropdown-menu-item {
@@ -1639,7 +1635,7 @@ body.steedos {
   .steedos-amis-form .antd-Form--normal .antd-Tabs .antd-Tabs-content .antd-Tabs-pane .form-content {
     display: grid;
     grid-template-columns: repeat(2, minmax(0, 1fr));
-    row-gap: 0rem;
+    row-gap: 0.75rem;
     -moz-column-gap: 1rem;
          column-gap: 1rem;
   }
@@ -1696,6 +1692,11 @@ body.steedos {
 .steedos-object-form .steedos-input-rich-text-readonly .antd-RichTextControl {
   border: 0;
 }
+@media (max-width: 767px) {
+  .steedos-object-form .antd-Form-item .antd-Form-label + .antd-Form-item-controlBox {
+    max-width: unset;
+  }
+}
 
 @media (max-width: 767px) {
   .steedos-amis-form.antd-Form {
@@ -1896,9 +1897,6 @@ body.steedos {
   .steedos-object-table colgroup col:nth-last-child(2) {
     display: none;
   }
-  .steedos-object-table tbody td.antd-Field--quickEditable > .antd-Form-static {
-    display: inline;
-  }
   .steedos-object-table tbody td.antd-Field--quickEditable .antd-Field-quickEditBtn {
     padding-right: 13px;
   }

package/dist/amis-object.cjs.js

@@ -3563,8 +3563,8 @@ const Router$1 = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-09-11 17:19:53
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-12-28 14:59:08
  * @Description: 
  */
 
@@ -3621,6 +3621,21 @@ function getLookupListView(refObjectConfig) {
   return listView;
 }
 
+
+/**
+ * 获取可比较的amis版本号
+ * @returns 只返回前两位版本，第三位忽略，比如3.6.3返回3.6
+ */
+function getComparableAmisVersion() {
+  let amis = (window.amisRequire && window.amisRequire('amis')) || window.Amis;
+  let amisVersion = amis && amis.version;
+  if(amisVersion){
+      let comparableVersions = amisVersion.split(".");
+      let comparableVersion = parseFloat(comparableVersions[0].toString() + "." + comparableVersions[1].toString());
+      return comparableVersion;
+  }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
@@ -5349,8 +5364,8 @@ async function getTableColumns$1(fields, options){
         const href = Router$1.getObjectDetailPath({
             ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
         });
-        columns[1].type = "tpl";
-        columns[1].tpl = `<a href="${href}">\${${columns[1].name}}</a>`;
+        columns[0].type = "tpl";
+        columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
     }
     return columns;
 }
@@ -14033,7 +14048,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
             sendOn.push(`this.${fName}`);
         });
         if(depend_on.length > 0){
-            apiInfo.url = `${apiInfo.url}?${depend_on.join('&')}`;
+            apiInfo.url = `${apiInfo.url}&${depend_on.join('&')}`;
             apiInfo.sendOn = `${sendOn.join(' && ')}`;
         }
     }
@@ -14141,6 +14156,13 @@ async function lookupToAmisSelect(field, readonly, ctx){
         autoComplete: apiInfo,
         searchable: true,
     };
+    let amisVersion = getComparableAmisVersion();
+    if(amisVersion >= 3.6){
+        // amis 3.6中不加source会造成子表组件中弹出行编辑窗口的lookup字段有时不请求接口（概率现象，同一个地方反复操作有时请求有时不请求）
+        // 但是同时配置autoComplete和source会多请求一次接口
+        // TODO:应该想办法把是否字段在子表组件内，即ctx.isInputTable，如果不在子表组件内不需要加source
+        data.source = apiInfo;
+    }
     //删除xlink:href中的rootUrl前缀，解决客户端svg为空的问题
     const select_menuTpl = `<span class='flex items-center mt-0.5'>
         <span role='img' aria-label='smile' class='anticon anticon-smile'>
@@ -14500,9 +14522,9 @@ const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
 // const Lookup = require('./lookup');
 
 function getBaseFields(readonly){
-    let calssName = 'm-1';
+    let className = 'm-0';
     if(readonly){
-        calssName = `${calssName}`;
+        className = `${className}`;
     }
     return [
         { 
@@ -14510,7 +14532,7 @@ function getBaseFields(readonly){
             label: "创建人",
             type: "static",
             labelClassName: 'text-left',
-            className: calssName,
+            className: className,
             tpl: getCreatedInfoTpl()
         },
         { 
@@ -14518,7 +14540,7 @@ function getBaseFields(readonly){
             label: "修改人",
             type: "static",
             labelClassName: 'text-left',
-            className: calssName,
+            className: className,
             tpl: getModifiedInfoTpl()
         }
     ]
@@ -15214,9 +15236,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
     }
     if(!_$1__namespace.isEmpty(convertData)){
         if(field.is_wide || convertData.type === 'group'){
-            convertData.className = 'col-span-2 m-1';
+            convertData.className = 'col-span-2 m-0';
         }else {
-            convertData.className = 'm-1';
+            convertData.className = 'm-0';
         }
         if(readonly){
             convertData.className = `${convertData.className} border-b`;
@@ -15622,7 +15644,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-12-27 13:50:26
+ * @LastEditTime: 2023-12-28 15:54:36
  */
 
 /**
@@ -16103,6 +16125,11 @@ async function getButtonActions(props, mode) {
     let dialogId = getComponentId("dialog", props.id);
     let buttonNextId = getComponentId("button_next", props.id);
     let formPaginationId = getComponentId("form_pagination", props.id);
+    let parentFormData = "${__super.__super.__super.__super || {}}";
+    let amisVersion = getComparableAmisVersion();
+    if(amisVersion < 3.6){
+        parentFormData = "${__super.__super || {}}";
+    }
     if (mode == "new" || mode == "edit") {
         // let actionShowNewDialog = {
         //     "actionType": "dialog",
@@ -16244,7 +16271,8 @@ async function getButtonActions(props, mode) {
                     // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
                     // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
                     // "__parentForm": "${__super.__super || {}}",
-                    "__parentForm": mode == "new" ? "$$" : "${__super.__super || {}}",
+                    // "__parentForm": mode == "new" ? "$$" : "${__super.__super || {}}",
+                    "__parentForm": mode == "new" ? "$$" : parentFormData,
                     "global": "${global}",
                     "uiSchema": "${uiSchema}",
                     "index": "${index}",
@@ -16337,7 +16365,7 @@ async function getButtonActions(props, mode) {
                         // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
                         // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
                         // "__parentForm": "${__super.__super || {}}",
-                        "__parentForm": "${__super.__super || {}}",
+                        "__parentForm": parentFormData,
                         "global": "${global}",
                         "uiSchema": "${uiSchema}",
                         "index": "${index}",
@@ -19539,7 +19567,8 @@ var AmisObjectButton = function (props) {
             renderData.listViewId = data.listViewId;
         }
         if (schema) {
-            schema.data = _$1.defaultsDeep({}, renderData, getDefaultRenderData(), schema.data);
+            //3.6版本的schema.data内多了event变量，影响了组件渲染
+            schema.data = _$1.defaultsDeep({}, { event: null }, renderData, getDefaultRenderData(), schema.data);
         }
         return (React__default["default"].createElement(React__default["default"].Fragment, null, button && amisSchema ? (React__default["default"].createElement(React__default["default"].Fragment, null, render('body', schema, {
             // 这里的信息会作为 props 传递给子组件，一般情况下都不需要这个,
@@ -19974,7 +20003,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                         type: "service",
                         data: serviceData,
                         style: style,
-                        className: "".concat(className, " sm:bg-gray-100 h-full  border-gray-300 steedos-object-listview ").concat(displayAs === 'split' ? 'sm:border-r' : 'sm:rounded sm:border'),
+                        className: "".concat(className, " sm:bg-gray-100 h-full  border-gray-300 steedos-object-listview ").concat(displayAs === 'split' ? 'sm:border-r' : 'sm:border-r'),
                         body: [{
                                 "type": "wrapper",
                                 "size": "none",
@@ -21289,7 +21318,7 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
             body: [
                 {
                     "type": "wrapper",
-                    "className": "bg-white sticky p-0 top-0 z-40 w-full flex-none backdrop-blur transition-colors duration-500 lg:z-50  border-b-[3px] border-sky-500 border-solid steedos-header-container",
+                    "className": "bg-white sticky p-0 top-0 z-40 w-full flex-none backdrop-blur transition-colors duration-500 lg:z-50  border-b-[3px] border-sky-500 border-solid steedos-header-container sm:shadow",
                     body: [
                         {
                             "type": "wrapper",
@@ -22143,7 +22172,7 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                         type: 'service',
                         className: {
                             "h-full": "true",
-                            "sm:px-3 sm:pt-3 page-list-grid": "${display != 'split'}",
+                            "page-list-grid": "${display != 'split'}",
                             "page-list-split": "${display == 'split'}"
                         },
                         body: listSchema