inl-ui 0.0.39 → 0.0.41

package/package.json

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

package/src/pageComponent/assets/styles/alarm/warning-record.less

@@ -1,7 +1,13 @@
 .warning-record {
+  flex-direction: column;
+
   .ant-form-item {
     margin-bottom: 12px !important;
   }
+
+  .ant-table-wrapper {
+    overflow: auto;
+  }
 }
 
 .record-table-image-preview-modal {

package/src/pageComponent/assets/styles/card/index.less

@@ -11,8 +11,10 @@
 }
 .cardWareHouse {
   height: 100%;
+  overflow: hidden;
   .card {
     height: calc(100% - 100px);
+    flex-direction: column;
     .cardgrid {
       height: 100%;
       &-content {
@@ -192,5 +194,9 @@
         margin-top: 10px;
       }
     }
+
+    .ant-table-wrapper {
+      overflow: auto;
+    }
   }
 }

package/src/pageComponent/assets/styles/login/login.less

@@ -136,9 +136,10 @@
 
       label {
         width: 73px;
+        display: inline-block;
         text-align: justify;
         text-align-last: justify;
-        display: inline-block;
+        white-space: nowrap;
       }
 
       .ant-form {

package/src/pageComponent/assets/styles/systemManager/aboutNew.less

@@ -1,7 +1,8 @@
 .aboutNew {
-  position: relative;
-  min-height: 600px;
   height: 100%;
+  min-height: 500px;
+  overflow: auto;
+  position: relative;
 
   .logoLine {
     justify-content: space-between;
@@ -28,7 +29,7 @@
 
       &::before {
         content: "";
-        border-left: 3px solid #1D33A2;
+        border-left: 3px solid #1d33a2;
         height: 10px;
         margin-right: 12px;
       }
@@ -45,16 +46,15 @@
       font-size: 14px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #5D616B;
+      color: #5d616b;
     }
 
     .software {
       height: 22px;
       font-size: 14px;
-      font-family: PingFangSC-Semibold,
-        PingFang SC;
+      font-family: PingFangSC-Semibold, PingFang SC;
       font-weight: 600;
-      color: #31363C;
+      color: #31363c;
       line-height: 22px;
 
       &:not(:first-child) {
@@ -63,7 +63,6 @@
     }
   }
 
-
   .bottom_line {
     position: absolute;
     left: 0;
@@ -85,15 +84,15 @@
         }
 
         .label {
-          color: #31363C;
+          color: #31363c;
           font-weight: 600;
         }
 
         .value {
-          color: #5D616B;
+          color: #5d616b;
           font-weight: 400;
         }
       }
     }
   }
-}
+}

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

@@ -31,8 +31,7 @@
   }
 
   > .ant-table-wrapper {
-    flex: 1;
-    overflow-y: auto;
+    overflow: auto;
   }
 
   .control {
@@ -67,6 +66,18 @@
   .left {
     width: 300px;
     margin-right: 20px;
+    .dep-tree {
+      height: 100%;
+
+      .common-tree {
+        height: 100%;
+        flex-direction: column;
+
+        .tree-container {
+          overflow: auto;
+        }
+      }
+    }
   }
   .right {
     flex: 1;
@@ -99,8 +110,7 @@
   }
 }
 
-.depManager,
-.menu-manager {
+.depManager {
   .tree {
     overflow-y: auto;
   }

package/src/pageComponent/assets/styles/systemManager/menu-manager.less

@@ -1,10 +1,13 @@
 .menu-manager {
-  display: flex;
-  gap: 32px;
   height: 100%;
+  overflow: hidden;
+  gap: 32px;
   .tree {
     width: 300px;
     .menu-select-tree {
+      .common-tree {
+        flex-direction: column;
+      }
       .utils-container {
         display: flex;
         justify-content: space-around;

package/src/pageComponent/assets/styles/systemManager/noticeManager/noticeCenter.less

@@ -1,6 +1,17 @@
 .noticeCenter {
+  flex-direction: column;
+  overflow: hidden;
   box-sizing: border-box;
   .volumeSent {
     cursor: pointer;
   }
+
+  .noticeCenter-content {
+    overflow: hidden;
+    flex-direction: column;
+
+    .ant-table-wrapper {
+      overflow: auto;
+    }
+  }
 }

package/src/pageComponent/assets/styles/systemManager/param-manager.less

@@ -1,7 +1,13 @@
 .param-manager {
+  flex-direction: column;
+  overflow: hidden;
   .ant-tabs {
     position: relative;
+    .ant-tabs-content-holder {
+      overflow: auto;
+    }
   }
+
   .tab-item {
     .operation {
       text-align: right;

package/src/pageComponent/assets/styles/systemManager/systemSetting.less

@@ -1,10 +1,10 @@
 .systemConfig {
   width: 100%;
   position: relative;
-  padding: 10px;
   display: flex;
   justify-content: space-between;
   font-size: 14px;
+  overflow: auto;
   .systemConfig_left {
     width: 48%;
   }

package/src/pageComponent/assets/styles/thingModel/factory.less

@@ -12,6 +12,7 @@
     background-color: #fff;
     padding-right: 20px;
     position: relative;
+    flex-direction: column;
     &:after {
       content: "";
       display: block;
@@ -27,6 +28,7 @@
     flex-grow: 1;
     background-color: #fff;
     margin-left: 20px;
+    overflow: auto;
   }
 }
 .flex {
@@ -103,23 +105,22 @@
   overflow: hidden;
   text-overflow: ellipsis;
   display: inline-block;
-  &.node_title_1{
+  &.node_title_1 {
     width: 188px;
     &.on {
       width: 148px;
     }
   }
-  &.node_title_2{
+  &.node_title_2 {
     width: 168px;
     &.on {
       width: 128px;
     }
   }
-  &.node_title_3{
+  &.node_title_3 {
     width: 148px;
     &.on {
       width: 108px;
     }
   }
-  
 }

package/src/pageComponent/components/CommonTree.tsx

@@ -247,7 +247,7 @@ const CommonTree = defineComponent({
     onBeforeUnmount(() => bus.off("tree/refresh", handleRefresh));
 
     return () => (
-      <div class="common-tree">
+      <div class="common-tree flex">
         {/* 搜索 */}
         <a-input
           style={{ marginBottom: "16px" }}

package/src/pageComponent/utils/format.ts

@@ -92,4 +92,15 @@ export function fomatEmployeeIdTree(res: any, label?: string, value?: string) {
   }
   return formatSubList(res);
 }
+
+export const getEnByZn = (val: string) => {
+  val = val
+    .replace(/ /g, "")
+    .replace(/‘/g, '"')
+    .replace(/“/g, '"')
+    .replace(/：/g, ":")
+    .replace(/「/g, "{")
+    .replace(/」/g, "}");
+  return val;
+};
 export default {};

package/src/pageComponent/views/alarms/warning-record/index.tsx

@@ -63,7 +63,7 @@ const WarningRecord = defineComponent({
     };
 
     return () => (
-      <div class="warning-record-index">
+      <div class="warning-record-index flex" style="overflow: hidden;">
         {isDetailShow.value ? (
           <AlarmDetail
             record={detailRecord.value}

package/src/pageComponent/views/alarms/warning-record/record-table.tsx

@@ -295,7 +295,7 @@ const WarningRecord = defineComponent({
     });
 
     return () => (
-      <div class="warning-record">
+      <div class="warning-record flex">
         <QueryFilter onSubmit={search} enumObj={enumObj} />
         <div class="operation" style={{ marginBottom: "16px" }}>
           <a-space>

package/src/pageComponent/views/card-center/cardWarehouse.tsx

@@ -222,7 +222,7 @@ const CardWareHouse = defineComponent({
     };
 
     // 详情数据
-    const data = ref({});
+    const data = ref<Item>({});
 
     // 详情弹窗
     const detailsVisible = ref(false);
@@ -373,7 +373,7 @@ const CardWareHouse = defineComponent({
             </a-row>
           </a-form>
         </div>
-        <div class="card">
+        <div class="card flex">
           {pattern.value === "list" ? (
             <>
               <div style={"margin-bottom: 20px;"}>

package/src/pageComponent/views/card-center/components/cardDetail.tsx

@@ -4,6 +4,7 @@
 import { defineComponent, onMounted, PropType, ref, watch } from "vue";
 import { Item } from "../cardWarehouse";
 import inlCard from "inl-card";
+import { getEnByZn } from "@/pageComponent/utils/format";
 
 export interface selectedItem {
   name: string;
@@ -211,6 +212,9 @@ export default defineComponent({
             <a-textarea
               v-model={[formState.value.parameter, "value"]}
               disabled={_props.disabled}
+              onChange={(e) => {
+                formState.value.parameter = getEnByZn(e.target.value);
+              }}
               onBlur={() => {
                 cardInfo.value.parameter = formState.value?.parameter || "";
               }}

package/src/pageComponent/views/card-center/components/pageDetail.tsx

@@ -4,6 +4,7 @@
 import { defineComponent, onMounted, PropType, ref, watch } from "vue";
 import { message } from "ant-design-vue";
 import { Item } from "../pageConfiguration";
+import { getEnByZn } from "@/pageComponent/utils/format";
 
 export interface selectedItem {
   name: string;
@@ -134,6 +135,9 @@ export default defineComponent({
           <a-textarea
             v-model={[formState.value.parameter, "value"]}
             disabled={_props.disabled}
+            onChange={(e) => {
+              formState.value.parameter = getEnByZn(e.target.value);
+            }}
             rows={4}
           />
         </a-form-item>

package/src/pageComponent/views/card-center/components/selectCard.tsx

@@ -34,6 +34,7 @@ export default defineComponent({
       "records"
     );
     const cardBox = (data) => {
+      data.parameter = data.parameter === "" ? "{}" : data.parameter;
       let parameter = {};
       try {
         parameter = JSON.parse(data.parameter ?? "{}") ?? {};
@@ -59,6 +60,7 @@ export default defineComponent({
             <div class="selectCard-item">
               <div>
                 <a-checkbox value={item}></a-checkbox>
+                <span>{item.remark}</span>
               </div>
               {cardBox(item)}
             </div>

package/src/pageComponent/views/card-center/less/pageConfiguration.less

@@ -0,0 +1,3 @@
+.pageConfiguration {
+  flex-direction: column;
+}

package/src/pageComponent/views/card-center/less/selectCard.less

@@ -14,6 +14,9 @@
       margin: 5px;
       > div:first-child {
         margin-bottom: 10px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
       }
       .inl-card_box {
         height: calc(100% - 30px) !important;

package/src/pageComponent/views/card-center/pageConfiguration.tsx

@@ -285,7 +285,7 @@ const pageConfiguration = defineComponent({
       getSystemList();
     });
     return () => (
-      <div class="">
+      <div class="pageConfiguration flex">
         <a-form ref={formRef} model={formState} colon={false} onSubmit={submit}>
           <a-row style={{ width: "100%" }}>
             {/* <a-col span={6}>
@@ -401,119 +401,120 @@ const pageConfiguration = defineComponent({
             </a-col>
           </a-row>
         </a-form>
-        <div class="">
-          <div style={"margin-bottom: 15px;"}>
-            <a-button
-              type="primary"
-              onClick={() => {
-                form.type = "add";
-                data.value = {};
-                detailsVisible.value = true;
-              }}
-            >
-              新增页面
-            </a-button>
-          </div>
-          <a-table
-            dataSource={tableList.value}
-            columns={column}
-            pagination={{
-              pageSize: pageSize.value,
-              current: currPage.value,
-              showSizeChanger: true,
-              showQuickJumper: true,
-              showTotal: (total: number) => `共${total}条`,
-              total: total.value,
-              "onUpdate:current": handlePageChange,
-              "onUpdate:pageSize": hanldePageSizeChange,
-            }}
-            loading={isLoading.value}
-            v-slots={{
-              bodyCell: ({ column, record }) => {
-                if (column.dataIndex === "enabled") {
-                  return record.enabled ? "是" : "否";
-                }
-                if (column.dataIndex === "endpoint") {
-                  return filter(
-                    state.terminalList,
-                    record.endpoint,
-                    "code",
-                    "name"
-                  );
-                }
-                if (column.dataIndex === "tags") {
-                  return filter(
-                    state.descriptionList,
-                    record.tags,
-                    "code",
-                    "name"
-                  );
-                }
-                if (column.dataIndex === "createDt") {
-                  return record.createDt
-                    ? dayjs(record.createDt).format("YYYY-MM-DD")
-                    : "--";
-                }
-                if (column.dataIndex === "updateDt") {
-                  return record.updateDt
-                    ? dayjs(record.updateDt).format("YYYY-MM-DD")
-                    : "--";
-                }
-                if (column.dataIndex === "action") {
-                  return (
-                    <a-space>
-                      <a-button
-                        type="link"
-                        onClick={() => {
-                          handleCopy(record.reference);
-                        }}
-                      >
-                        复制引用地址
-                      </a-button>
-                      <a-button
-                        type="link"
-                        onClick={() => {
-                          data.value = record;
-                          editPageVisible.value = true;
-                        }}
-                      >
-                        编辑页面
-                      </a-button>
-                      <a-button
-                        type="link"
-                        onClick={() => {
-                          form.type = "detail";
-                          data.value = record;
-                          detailsVisible.value = true;
-                        }}
-                      >
-                        详情
-                      </a-button>
-                      <a-button
-                        type="link"
-                        onClick={() => {
-                          form.type = "edit";
-                          data.value = record;
-                          detailsVisible.value = true;
-                        }}
-                      >
-                        修改
-                      </a-button>
-                      <a-popconfirm
-                        title="确认删除？"
-                        onConfirm={() => {
-                          handleDelete(record.id);
-                        }}
-                      >
-                        <a-button type="link">删除</a-button>
-                      </a-popconfirm>
-                    </a-space>
-                  );
-                }
-              },
+
+        <div style={"margin-bottom: 15px;"}>
+          <a-button
+            type="primary"
+            onClick={() => {
+              form.type = "add";
+              data.value = {};
+              detailsVisible.value = true;
             }}
-          />
+          >
+            新增页面
+          </a-button>
         </div>
+
+        <a-table
+          dataSource={tableList.value}
+          columns={column}
+          pagination={{
+            pageSize: pageSize.value,
+            current: currPage.value,
+            showSizeChanger: true,
+            showQuickJumper: true,
+            showTotal: (total: number) => `共${total}条`,
+            total: total.value,
+            "onUpdate:current": handlePageChange,
+            "onUpdate:pageSize": hanldePageSizeChange,
+          }}
+          loading={isLoading.value}
+          v-slots={{
+            bodyCell: ({ column, record }) => {
+              if (column.dataIndex === "enabled") {
+                return record.enabled ? "是" : "否";
+              }
+              if (column.dataIndex === "endpoint") {
+                return filter(
+                  state.terminalList,
+                  record.endpoint,
+                  "code",
+                  "name"
+                );
+              }
+              if (column.dataIndex === "tags") {
+                return filter(
+                  state.descriptionList,
+                  record.tags,
+                  "code",
+                  "name"
+                );
+              }
+              if (column.dataIndex === "createDt") {
+                return record.createDt
+                  ? dayjs(record.createDt).format("YYYY-MM-DD")
+                  : "--";
+              }
+              if (column.dataIndex === "updateDt") {
+                return record.updateDt
+                  ? dayjs(record.updateDt).format("YYYY-MM-DD")
+                  : "--";
+              }
+              if (column.dataIndex === "action") {
+                return (
+                  <a-space>
+                    <a-button
+                      type="link"
+                      onClick={() => {
+                        handleCopy(record.reference);
+                      }}
+                    >
+                      复制引用地址
+                    </a-button>
+                    <a-button
+                      type="link"
+                      onClick={() => {
+                        data.value = record;
+                        editPageVisible.value = true;
+                      }}
+                    >
+                      编辑页面
+                    </a-button>
+                    <a-button
+                      type="link"
+                      onClick={() => {
+                        form.type = "detail";
+                        data.value = record;
+                        detailsVisible.value = true;
+                      }}
+                    >
+                      详情
+                    </a-button>
+                    <a-button
+                      type="link"
+                      onClick={() => {
+                        form.type = "edit";
+                        data.value = record;
+                        detailsVisible.value = true;
+                      }}
+                    >
+                      修改
+                    </a-button>
+                    <a-popconfirm
+                      title="确认删除？"
+                      onConfirm={() => {
+                        handleDelete(record.id);
+                      }}
+                    >
+                      <a-button type="link">删除</a-button>
+                    </a-popconfirm>
+                  </a-space>
+                );
+              }
+            },
+          }}
+        />
+
         <a-modal
           v-model={[detailsVisible.value, "visible"]}
           title={form.title}

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

@@ -429,7 +429,7 @@ const FactoryManage = defineComponent({
     });
     return () => (
       <div class="manufactorManager flex">
-        <div class="tree_data">
+        <div class="tree_data tree_data">
           <a-input-search
             allowClear
             v-model={[searchValue.value, "value"]}

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

@@ -6,8 +6,7 @@
   overflow: hidden;
 
   .ant-table-wrapper {
-    flex: 1;
-    overflow-y: auto;
+    overflow: auto;
   }
 
   .planBox {

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

@@ -1,5 +1,6 @@
 .pssIndex {
   height: 100%;
+  overflow: hidden;
 
   .pssList {
     height: 100%;

package/src/pageComponent/views/systemManager/authManager/menuManager/index.tsx

@@ -82,7 +82,7 @@ const MenuManager = defineComponent({
     };
 
     return () => (
-      <div class="menu-manager">
+      <div class="menu-manager flex">
         {/* 左侧菜单树选择 */}
         <div class="tree">
           <MenuSelectTree onSelect={handleNodeSelect} onEdit={handleNodeEdit} />