inl-ui 0.0.47 → 0.0.49

package/src/pageComponent/views/thingInstance/index.tsx

@@ -627,10 +627,10 @@ const com = defineComponent({
 
     return () => (
       <div
-        class="thingApp flex"
+        class="thingApp"
         style={{ justifyContent: isLoad.value ? "center" : "" }}
       >
-        {page.value === "edit" ? (
+        {page.value === "edit" && (
           <editThing
             data={pageData.editData}
             triggerModeList={triggerModeList}
@@ -650,10 +650,9 @@ const com = defineComponent({
               _context.emit("toRoute");
             }}
           />
-        ) : (
-          ""
         )}
-        {page.value === "add" ? (
+
+        {page.value === "add" && (
           <addThing
             data={pageData.addData}
             triggerModeList={triggerModeList}
@@ -672,56 +671,56 @@ const com = defineComponent({
               _context.emit("toRoute");
             }}
           />
-        ) : (
-          ""
         )}
-        {page.value === "detail" ? (
-          <a-spin spinning={isLoad.value}>
-            {!isLoad.value && (
-              <thingDetail
-                data={pageData.editData}
-                id={pageData.id}
-                hideBtnLine={hideBtnLine.value}
-                hideEditBtn={hideEditBtn.value}
-                hideBackBtn={hideBackBtn.value}
-                onBack={() => {
-                  if (formQuery.thingCode) {
-                    refresh();
-                  } else {
-                    refreshAll();
-                    if (newThing.value) {
-                      newThing.value = null;
-                      getTreeData();
+
+        {page.value === "detail" && (
+          <div style="height: 100%; overflow: auto;">
+            <a-spin spinning={isLoad.value}>
+              {!isLoad.value && (
+                <thingDetail
+                  data={pageData.editData}
+                  id={pageData.id}
+                  hideBtnLine={hideBtnLine.value}
+                  hideEditBtn={hideEditBtn.value}
+                  hideBackBtn={hideBackBtn.value}
+                  onBack={() => {
+                    if (formQuery.thingCode) {
+                      refresh();
+                    } else {
+                      refreshAll();
+                      if (newThing.value) {
+                        newThing.value = null;
+                        getTreeData();
+                      }
                     }
-                  }
-                  page.value = "list";
-                }}
-                onBackList={() => {
-                  if (formQuery.thingCode) {
-                    refresh();
-                  } else {
-                    refreshAll();
-                    if (newThing.value) {
-                      newThing.value = null;
-                      getTreeData();
+                    page.value = "list";
+                  }}
+                  onBackList={() => {
+                    if (formQuery.thingCode) {
+                      refresh();
+                    } else {
+                      refreshAll();
+                      if (newThing.value) {
+                        newThing.value = null;
+                        getTreeData();
+                      }
                     }
-                  }
-                  page.value = "list";
-                }}
-                onToEdit={(res) => {
-                  toEdit(res);
-                }}
-              />
-            )}
-          </a-spin>
-        ) : (
-          ""
+                    page.value = "list";
+                  }}
+                  onToEdit={(res) => {
+                    toEdit(res);
+                  }}
+                />
+              )}
+            </a-spin>
+          </div>
         )}
+
         <div
           class="thingInstance flex"
           style={page.value !== "list" ? "display:none" : ""}
         >
-          <div class="left_wrap">
+          <div class="left_wrap flex">
             <div class="flex_lr_c">
               <div class="flex-center title flex1">
                 <span>物模型</span>
@@ -741,10 +740,7 @@ const com = defineComponent({
                 placeholder="搜索"
                 allowClear
               />
-              <div
-                class="mar-t-20 tree_wrap"
-                style={{ height: "calc(100vh - 240px)" }}
-              >
+              <div class="mar-t-20 tree_wrap">
                 {tree.data.length ? (
                   <a-tree
                     show-line
@@ -772,7 +768,7 @@ const com = defineComponent({
               </div>
             </div>
           </div>
-          <div class="table_wrap">
+          <div class="table_wrap flex">
             {!formQuery.thingCode ? (
               // <a-empty
               //   image="/micro-assets/platform-web/empty.png"
@@ -879,7 +875,7 @@ const com = defineComponent({
                     批量配点
                   </a-button>
                 </a-space>
-                <div class="mar-t-20">
+                <div class="mar-t-20 tableBox">
                   <a-table
                     rowKey={(record) => record.thingInst.id}
                     columns={columnsAll}
@@ -1092,7 +1088,7 @@ const com = defineComponent({
                     批量配点
                   </a-button>
                 </a-space>
-                <div class="mar-t-20">
+                <div class="mar-t-20 tableBox">
                   <a-table
                     rowKey="ID"
                     columns={columns.value}

package/src/pageComponent/views/thingInstance/less/editThing.less

@@ -1,4 +1,6 @@
 .editThing {
+  height: 100%;
+  overflow: auto;
   .header {
     .ant-page-header {
       padding: 0;

package/src/pageComponent/views/thingInstance/less/thingInstance.less

@@ -1,9 +1,11 @@
 .thingApp {
-  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
 }
 
 .thingInstance {
   background: #fff;
+  height: 100%;
 
   .gap {
     gap: 8px;
@@ -12,6 +14,7 @@
   .left_wrap {
     height: 100%;
     width: 220px;
+    flex-direction: column;
     padding-right: 0px !important;
     flex-shrink: 0;
     box-sizing: border-box;
@@ -25,6 +28,9 @@
     }
     .tree_data {
       margin-top: 20px;
+      display: flex;
+      flex-direction: column;
+      overflow: auto;
       .search {
         padding-right: 20px;
       }
@@ -33,14 +39,13 @@
       }
     }
     .tree_wrap {
-      height: calc(100vh - 270px);
-      overflow-y: auto;
+      overflow: auto;
     }
   }
   .table_wrap {
-    flex-grow: 1;
     padding-left: 20px;
     box-sizing: border-box;
+    flex-direction: column;
     .ant-empty {
       position: relative;
       top: 50%;
@@ -52,6 +57,10 @@
         width: 100px;
       }
     }
+
+    .tableBox {
+      overflow: auto;
+    }
   }
 }
 .align-r {