inl-ui 0.0.49 → 0.0.50

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

@@ -11,7 +11,6 @@
 }
 .cardWareHouse {
   height: 100%;
-  overflow: hidden;
   .card {
     height: calc(100% - 100px);
     flex-direction: column;
@@ -195,7 +194,7 @@
       }
     }
 
-    .ant-table-wrapper {
+    .tableBox {
       overflow: auto;
     }
   }

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

@@ -135,11 +135,14 @@
       flex-direction: column;
 
       label {
-        width: 73px;
-        display: inline-block;
-        text-align: justify;
-        text-align-last: justify;
-        white-space: nowrap;
+        .labelText {
+          width: 55px;
+          display: inline-block;
+          text-align: justify;
+          text-align-last: justify;
+          white-space: nowrap;
+          margin-right: 2px;
+        }
       }
 
       .ant-form {

package/src/pageComponent/index.ts

@@ -38,7 +38,6 @@ import record from "../pageComponent/views/pressureFiltration/record";
 import unloading from "../pageComponent/views/pressureFiltration/unloading";
 import pressureFiltrationHome from "../pageComponent/views/pressureFiltration/pressureFiltrationHome";
 import factoryManage from "../pageComponent/views/factoryManage";
-import elcRoom from "../pageComponent/views/elcRoom";
 import boardScreen from "../pageComponent/views/boardScreen";
 import cardWarehouse from "../pageComponent/views/card-center/cardWarehouse";
 import pageConfiguration from "../pageComponent/views/card-center/pageConfiguration";
@@ -101,7 +100,6 @@ export default [
   unloading,
   pressureFiltrationHome,
   factoryManage,
-  elcRoom,
   boardScreen,
   cardWarehouse,
   pageConfiguration,
@@ -121,5 +119,5 @@ export default [
   dayWYPlan,
   processDrawingPreviewModal,
   productManager,
-  projectManager
+  projectManager,
 ];

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

@@ -1,5 +1,5 @@
 import { defineComponent, onMounted, onUnmounted, reactive, ref } from "vue";
-import { deepclone } from "@/pageComponent/utils/";
+import { deepclone } from "@/pageComponent/utils";
 import tupu from "./tupu";
 import room from "./room";
 import { message } from "ant-design-vue";

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

@@ -370,100 +370,103 @@ const CardWareHouse = defineComponent({
                   新增卡片
                 </a-button>
               </div>
-              <a-table
-                dataSource={tableList.value}
-                columns={column}
-                rowKey="id"
-                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 === "size") {
-                      return `${record.length ? record.length : "-"}*${
-                        record.width ? record.width : "-"
-                      }`;
-                    }
-                    if (column.dataIndex === "endpoint") {
-                      return filter(
-                        state.terminalList,
-                        record.endpoint,
-                        "code",
-                        "name"
-                      );
-                    }
-                    if (column.dataIndex === "description") {
-                      return filter(
-                        state.descriptionList,
-                        record.description,
-                        "code",
-                        "name"
-                      );
-                    }
-                    if (column.dataIndex === "enabled") {
-                      return (
-                        <a-switch
-                          v-model={[record.enabled, "checked"]}
-                          onChange={() => {
-                            handleChange(record.id, record.enabled);
-                          }}
-                        ></a-switch>
-                      );
-                    }
 
-                    if (column.dataIndex === "action") {
-                      return (
-                        <a-space>
-                          <a-button
-                            type="link"
-                            onClick={() => {
-                              handleCopy(record.reference);
-                            }}
-                          >
-                            复制引用名
-                          </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);
+              <div class="tableBox">
+                <a-table
+                  dataSource={tableList.value}
+                  columns={column}
+                  rowKey="id"
+                  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 === "size") {
+                        return `${record.length ? record.length : "-"}*${
+                          record.width ? record.width : "-"
+                        }`;
+                      }
+                      if (column.dataIndex === "endpoint") {
+                        return filter(
+                          state.terminalList,
+                          record.endpoint,
+                          "code",
+                          "name"
+                        );
+                      }
+                      if (column.dataIndex === "description") {
+                        return filter(
+                          state.descriptionList,
+                          record.description,
+                          "code",
+                          "name"
+                        );
+                      }
+                      if (column.dataIndex === "enabled") {
+                        return (
+                          <a-switch
+                            v-model={[record.enabled, "checked"]}
+                            onChange={() => {
+                              handleChange(record.id, record.enabled);
                             }}
-                          >
-                            <a-button type="link">删除</a-button>
-                          </a-popconfirm>
-                        </a-space>
-                      );
-                    }
-                  },
-                }}
-              />
+                          ></a-switch>
+                        );
+                      }
+
+                      if (column.dataIndex === "action") {
+                        return (
+                          <a-space>
+                            <a-button
+                              type="link"
+                              onClick={() => {
+                                handleCopy(record.reference);
+                              }}
+                            >
+                              复制引用名
+                            </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>
             </>
           ) : (
             <div class="cardgrid">

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

@@ -84,14 +84,14 @@ export default defineComponent({
             type="primary"
             style={{ marginLeft: "10px" }}
             onClick={() => {
-              const cardList = cardCheck.value.map((item: any) => ({
-                cname: item.cardName,
-                name: item.reference,
-                developer: item.developer,
-                equipment: item.endpoint,
-                parameter: item.parameter,
-              }));
-              ctx.emit("submit", cardList);
+              // const cardList = cardCheck.value.map((item: any) => ({
+              //   cname: item.cardName,
+              //   name: item.reference,
+              //   developer: item.developer,
+              //   equipment: item.endpoint,
+              //   parameter: item.parameter,
+              // }));
+              ctx.emit("submit", cardCheck.value);
             }}
           >
             确 定

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

@@ -1,7 +1,5 @@
 .pageConfiguration {
-  flex-direction: column;
-
-  .ant-table-wrapper {
+  .tableBox {
     overflow: auto;
   }
 }

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

@@ -287,7 +287,7 @@ const pageConfiguration = defineComponent({
       getSystemList();
     });
     return () => (
-      <div class="pageConfiguration flex">
+      <div class="pageConfiguration">
         <a-form ref={formRef} model={formState} colon={false} onSubmit={submit}>
           <a-row style={{ width: "100%" }}>
             {/* <a-col span={6}>
@@ -417,105 +417,111 @@ const pageConfiguration = defineComponent({
           </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 class="tableBox">
+          <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 === "cardCount") {
+                  const pageDetail = JSON.parse(record.pageDetail);
+                  return pageDetail.child.length;
+                }
+                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>
 
         <a-modal
           v-model={[detailsVisible.value, "visible"]}

package/src/pageComponent/views/login/box.tsx

@@ -250,10 +250,27 @@ export default defineComponent({
             span: 24,
           }}
         >
-          <formItem label="用户名：" wrapper-col={{ span: 50 }}>
+          <formItem
+            vSlots={{
+              label: () => (
+                <div class="flex">
+                  <div class="labelText">用户名</div>：
+                </div>
+              ),
+            }}
+            wrapper-col={{ span: 50 }}
+          >
             <a-input v-model={[formVal.username, "value"]} />
           </formItem>
-          <formItem label="密码：">
+          <formItem
+            vSlots={{
+              label: () => (
+                <div class="flex">
+                  <div class="labelText">密码</div>：
+                </div>
+              ),
+            }}
+          >
             <a-input-password v-model={[formVal.password, "value"]} />
           </formItem>
 

package/src/pageComponent/views/productionPlanManager/yearPCPlan.tsx

@@ -367,7 +367,7 @@ const com = defineComponent({
             model={monthPlanFormState.value}
             ref={monthPlanFormRef}
             name="basic"
-            labelCol={{ style: { width: "100px" } }}
+            labelCol={{ style: { width: "110px" } }}
             autocomplete="off"
           >
             <a-row class="row" gutter={[16, 16]} style="width: 100%;">