npm - inl-ui - Versions diffs - 0.0.38 → 0.0.39 - Mend

inl-ui 0.0.38 → 0.0.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "inl-ui",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "工业 pc ui库",
   "main": "dist/index.js",
   "types": "./dist/types/src/index.d.ts",

package/src/pageComponent/assets/styles/systemManager/index.less CHANGED Viewed

@@ -24,11 +24,17 @@
 .postManager {
   display: flex;
   flex-direction: column;
+  overflow: hidden;
   .table-search {
     margin-bottom: 16px;
   }
+  > .ant-table-wrapper {
+    flex: 1;
+    overflow-y: auto;
+  }
   .control {
     margin-bottom: 16px;
   }

package/src/pageComponent/views/productionPlanManager/assets/productionPlan.less CHANGED Viewed

@@ -2,6 +2,14 @@
 .productionPlan,
 .productionPlanConfig {
+  flex-direction: column;
+  overflow: hidden;
+  .ant-table-wrapper {
+    flex: 1;
+    overflow-y: auto;
+  }
   .planBox {
     .line {
       width: 600px;
@@ -74,7 +82,7 @@
   .titleLine {
     &::before {
-      content: '';
+      content: "";
       width: 8px;
       height: 8px;
       background: #3e7eff;

package/src/pageComponent/views/productionPlanManager/productionPlanConfig.tsx CHANGED Viewed

@@ -261,7 +261,7 @@ const com = defineComponent({
     };
     return () => (
-      <div class="productionPlanConfig">
+      <div class="productionPlanConfig flex">
         <a-row class="row" style="margin-bottom: 10px">
           <a-col span="6">
             <a-button type="primary" onClick={addConfig}>

package/src/pageComponent/views/pss/assets/less/index.less CHANGED Viewed

@@ -53,6 +53,7 @@
       .table {
         flex: 1;
+        overflow-y: auto;
         .operation {
           display: flex;

package/src/pageComponent/views/pss/components/table.tsx CHANGED Viewed

@@ -565,7 +565,7 @@ export default defineComponent({
     };
     return () => (
-      <div class="pssList_content">
+      <div class="pssList_content flex">
         {state.typeOptions.length > 0 && state.statusOptions.length > 0 && (
           <div class="dropSelect">
             <a-dropdown
@@ -618,7 +618,7 @@ export default defineComponent({
                 },
               }}
             >
-              <div class="">
+              <div>
                 <span>
                   {(state.statusOptions[state.status] as any).text}
                   <CaretDownOutlined />

package/src/pageComponent/views/pssRecord/assets/index.less CHANGED Viewed

@@ -1,6 +1,8 @@
 .pssRecord {
   height: 100%;
   position: relative;
+  overflow: hidden;
+  flex-direction: column;
   .seachFrom {
     justify-content: space-between;
@@ -13,6 +15,7 @@
   .table {
     flex: 1;
+    overflow-y: auto;
     .operation {
       display: flex;

package/src/pageComponent/views/pssRecord/index.tsx CHANGED Viewed

@@ -197,7 +197,7 @@ const com = defineComponent({
     };
     return () => (
-      <div class="pssRecord" id="pssRecord">
+      <div class="pssRecord flex" id="pssRecord">
         <div class="seachFrom flex">
           <div class="operation_btn flex">
             <Button

package/src/pageComponent/views/video/assets/styles/video/photo.less CHANGED Viewed

@@ -11,7 +11,7 @@
 }
 .photoPage {
   width: 100%;
-  margin: 0px 20px 20px 10px;
+  flex-direction: column;
   box-sizing: border-box;
   background-color: #fff;
   overflow: auto;
@@ -44,6 +44,10 @@
       margin: 0 20px 20px 0;
     }
   }
+  .body {
+    flex: 1;
+    overflow-y: auto;
+  }
   .alarmTable {
     .tableOpera {
       font-weight: 500;

package/src/pageComponent/views/video/assets/styles/video/preview.less CHANGED Viewed

@@ -424,6 +424,15 @@
       flex: 1;
       font-size: 13px;
     }
+    img {
+      margin: 0;
+      width: 15px;
+      height: 15px;
+      &.active-l {
+        margin-left: 5px;
+      }
+    }
   }
   .itemgz {
     .ant-collapse-header {

package/src/pageComponent/views/video/preview/components/followItem.tsx CHANGED Viewed

@@ -152,7 +152,11 @@ export default defineComponent({
                         }}
                         title="确定取消关注？"
                       >
-                        <DeleteOutlined title="取消关注" class="icons" />
+                        <img
+                          class="active-l"
+                          src="/micro-assets/inl/video/operation/collectYes.png"
+                          alt="取消关注"
+                        />
                       </a-popconfirm>
                     </div>
                   );

package/src/pageComponent/views/video/preview/components/treeItem.tsx CHANGED Viewed

@@ -146,7 +146,7 @@ export default defineComponent({
       collctData.concernUuid = "";
       collctData.uuid && (collctData.uuid = "");
       e.stopPropagation();
-      collctData.uuid && (collctData.uuid = item?.uuid);
+      item?.uuid && (collctData.uuid = item?.uuid);
       getConcern();
       collectVisible.value = true;
     };

package/src/pageComponent/views/video/preview/preview.tsx CHANGED Viewed

@@ -549,27 +549,27 @@ const com = defineComponent({
             )}
           </a-tabs>
-          {tabValue.value === "1" ? (
-            <tree-item
-              onGetFollow={getFollow}
-              onTitleChange={titleChange}
-              ref={treeItemRef}
-              onDragTree={treeDrag}
-              onStopVideo={(uuid: string, key: string) => {
-                changeVideo(uuid, key, imgType.acitveClass);
-              }}
-              class="photoTree"
-              domType={imgType.type}
-            />
-          ) : (
-            <followItem
-              domType={imgType.type}
-              onStopVideo={(uuid: string, key: string) => {
-                changeVideo(uuid, key, imgType.acitveClass);
-              }}
-              ref={followRef}
-            />
-          )}
+          <tree-item
+            v-show={tabValue.value === "1"}
+            onGetFollow={getFollow}
+            onTitleChange={titleChange}
+            ref={treeItemRef}
+            onDragTree={treeDrag}
+            onStopVideo={(uuid: string, key: string) => {
+              changeVideo(uuid, key, imgType.acitveClass);
+            }}
+            class="photoTree"
+            domType={imgType.type}
+          />
+          <followItem
+            v-show={tabValue.value === "2"}
+            domType={imgType.type}
+            onStopVideo={(uuid: string, key: string) => {
+              changeVideo(uuid, key, imgType.acitveClass);
+            }}
+            ref={followRef}
+          />
         </div>
         <div
           class={[

package/src/pageComponent/views/video/sbgl/photo.tsx CHANGED Viewed

@@ -367,7 +367,7 @@ const com = defineComponent({
       userInfo = JSON.parse(localStorage.getItem("userinfo") || "");
     });
     return () => (
-      <div class="photoPage">
+      <div class="photoPage flex">
         <CheckDialog />
         <a-modal
           v-model={[batchType.value, "visible"]}

package/src/pageComponent/views/workforceManager/workforcePlan/assets/workforcePlan.less CHANGED Viewed

@@ -1,6 +1,9 @@
 @borderColor: #000;
 .workforcePlan {
+  flex-direction: column;
+  overflow: hidden;
   .filter {
     margin-bottom: 16px;
     .form {
@@ -8,6 +11,8 @@
     }
   }
   .table-container {
+    flex: 1;
+    overflow-y: auto;
     .operation {
       display: flex;
       justify-content: space-between;

package/src/pageComponent/views/workforceManager/workforcePlan/index.tsx CHANGED Viewed

@@ -93,7 +93,7 @@ const com = defineComponent({
     };
     return () => (
-      <div class="workforcePlan">
+      <div class="workforcePlan flex">
         {/* 筛选框 */}
         <div class="filter">
           <a-form class="form" layout="inline">

package/src/pageComponent/views/workforceManager/workforceRule/assets/classManagerAndWorkforceRuleComp.less ADDED Viewed

@@ -0,0 +1,23 @@
+.classManager,
+.workforceRuleComp {
+  flex-direction: column;
+  height: 100%;
+  .row {
+    margin-bottom: 10px;
+  }
+  .ant-table-wrapper {
+    flex: 1;
+    overflow-y: auto;
+  }
+}
+.chassManagerModal {
+  .classManager_infoRow {
+    padding: 6px 0;
+    .mtop {
+      margin-top: 6px;
+    }
+  }
+}

package/src/pageComponent/views/workforceManager/workforceRule/assets/index.less ADDED Viewed

@@ -0,0 +1,10 @@
+.workforceRule {
+  overflow: hidden;
+  .ant-tabs.ant-tabs-top {
+    height: 100%;
+  }
+  .ant-tabs-content.ant-tabs-content-top {
+    height: 100%;
+  }
+}

package/src/pageComponent/views/workforceManager/workforceRule/components/classManager.tsx CHANGED Viewed

@@ -4,7 +4,7 @@ import { message, Modal } from "ant-design-vue";
 import useTableList from "@/pageComponent/hooks/useTableList";
 import workforceApi from "@/api/workforceManager";
-import "../assets/classManager.less";
+import "../assets/classManagerAndWorkforceRuleComp.less";
 const columns = [
   {
@@ -149,7 +149,7 @@ export default defineComponent({
     const formRef = ref();
     return () => (
-      <div class="classManager">
+      <div class="classManager flex">
         <a-row class="row">
           <a-col span="24" style={{ textAlign: "right" }}>
             <a-button

package/src/pageComponent/views/workforceManager/workforceRule/components/{workforceRule.tsx → workforceRuleComp.tsx} RENAMED Viewed

@@ -5,6 +5,8 @@ import useTableList from "@/pageComponent/hooks/useTableList";
 import workforceApi from "@/api/workforceManager";
+import "../assets/classManagerAndWorkforceRuleComp.less";
 const columns = [
   {
     title: "排班编码",
@@ -102,7 +104,7 @@ export default defineComponent({
     };
     return () => (
-      <div class="classManager">
+      <div class="workforceRuleComp flex">
         <a-form
           model={searchFormState.value}
           ref={searchFormRef}

package/src/pageComponent/views/workforceManager/workforceRule/index.tsx CHANGED Viewed

@@ -2,7 +2,9 @@ import { defineComponent, ref } from "vue";
 import utils from "@/utils";
 import ClassManager from "./components/classManager";
-import WorkforceRule from "./components/workforceRule";
+import WorkforceRuleComp from "./components/workforceRuleComp";
+import "./assets/index.less";
 const com = defineComponent({
   setup() {
@@ -14,12 +16,13 @@ const com = defineComponent({
           v-model={[activeKey.value, "activeKey"]}
           animated
           destroyInactiveTabPane
+          style="height: 100%;"
         >
           <a-tab-pane key="1" tab="班制管理">
             <ClassManager />
           </a-tab-pane>
           <a-tab-pane key="2" tab="排班规则">
-            <WorkforceRule />
+            <WorkforceRuleComp />
           </a-tab-pane>
         </a-tabs>
       </div>

package/src/pageComponent/views/workforceManager/workforceRule/assets/classManager.less DELETED Viewed

@@ -1,14 +0,0 @@
-.classManager {
-  .row {
-    margin-bottom: 10px;
-  }
-}
-.chassManagerModal {
-  .classManager_infoRow {
-    padding: 6px 0;
-    .mtop {
-      margin-top: 6px;
-    }
-  }
-}