更新依赖和新主题

package.json

@@ -37,7 +37,7 @@
         "cssnano": "^6.0.1",
         "eslint": "^8.52.0",
         "eslint-plugin-vue": "^9.18.0",
-        "hc-vue3-ui": "^2.3.2",
+        "hc-vue3-ui": "^2.3.3",
         "postcss": "^8.4.31",
         "sass": "^1.69.4",
         "tailwindcss": "3.3.4",

src/App.vue

@@ -1,7 +1,7 @@
 <template>
-    <HcAppConfig>
+    <hc-app-config>
         <router-view />
-    </HcAppConfig>
+    </hc-app-config>
 </template>
 
 <script setup>

src/views/data-fill/collapse-form/index.vue

@@ -109,12 +109,12 @@
     <HcContextMenu ref="contextMenuRef" :datas="tableFormMenu" @item-click="handleMenuSelect" />
 
     <!-- 上传文件 -->
-    <HcDialog :footer="false" :show="uploadModal" title="上传文件" widths="38rem" @close="uploadModalClose">
+    <hc-new-dialog v-model="uploadModal" :footer="false" title="上传文件" widths="38rem" @close="uploadModalClose">
         <HcUpload :datas="uploadData" :file-list="fileListData" :is-canupload="isStatus == 3" @change="uploadChange" />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 操作提示 -->
-    <HcDialog :footer="false" :show="actionTipModal" title="操作提示" widths="38rem" @close="actionTipModalClose">
+    <hc-new-dialog v-model="actionTipModal" :footer="false" title="操作提示" widths="38rem" @close="actionTipModalClose">
         <div class="data-fill-table-tip-box">
             <div class="text-gray-400 tip-item">
                 1、灰色框代表可通过系统识别计算，公式自动引用，可通过公式计算少量数据，(表头数据及简单)，也可只填写白色框数据
@@ -134,24 +134,16 @@
                 4、完善资料填写后记得一定要保存哦
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 插入设计值/频率 -->
-    <HcDialog
-        :loading="designModalLoading" :show="designModal" is-to-body save-text="确认插入"
-        title="插入设计值/频率" widths="600px"
-        @close="closeDesignModal" @save="designModalSave"
-    >
+    <hc-new-dialog v-model="designModal" :loading="designModalLoading" save-text="确认插入" title="插入设计值/频率" widths="600px" @close="closeDesignModal" @save="designModalSave">
         <el-alert :closable="false" title="填写完设计值和频率，系统自动计算实测值" type="warning" />
         <el-form ref="formDesignRef" :model="formDesignModel" label-width="auto" size="large">
             <div class="form-item-div text-center mb-3">
                 <el-radio-group v-model="formDesignModel.type" size="large">
-                    <el-radio :label="1">
-                        公路工程
-                    </el-radio>
-                    <el-radio :label="2" class="ml-4">
-                        水利水电
-                    </el-radio>
+                    <el-radio :label="1">公路工程</el-radio>
+                    <el-radio :label="2" class="ml-4">水利水电</el-radio>
                 </el-radio-group>
             </div>
             <el-form-item label="设计值">
@@ -186,28 +178,21 @@
             </el-form-item>
             <el-form-item label="方向">
                 <el-radio-group v-model="formDesignModel.direction" size="large">
-                    <el-radio :label="1">
-                        横向
-                    </el-radio>
-                    <el-radio :label="2" class="ml-4">
-                        纵向
-                    </el-radio>
+                    <el-radio :label="1">横向</el-radio>
+                    <el-radio :label="2" class="ml-4">纵向</el-radio>
                 </el-radio-group>
             </el-form-item>
         </el-form>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 插入特殊字符 -->
-    <HcDialog
-        :loading="specialModalLoading" :show="specialModal" is-to-body save-text="确认插入" title="插入特殊字符"
-        widths="600px" @close="specialModalClose" @save="specialNodeClick"
-    >
+    <hc-new-dialog v-model="specialModal" :loading="specialModalLoading" save-text="确认插入" title="插入特殊字符" widths="600px" @close="specialModalClose" @save="specialNodeClick">
         <HcSpecialDiaolg v-if="specialModal" ref="specialRef" @change="specialDiaolgChange" />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 关联试验数据 -->
-    <HcDialog
-        :footer="false" :loading="testModalLoading" :show="testModal" is-table is-to-body title="关联试验数据"
+    <hc-new-dialog
+        v-model="testModal" :footer="false" :loading="testModalLoading" is-table title="关联试验数据"
         widths="84%" @close="testModalClose"
     >
         <HcTestDiaolg
@@ -215,26 +200,24 @@
             :wbs-id="wbsTemp_id"
             :wbs-type="wbs_type" @change="testTableRowName"
         />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 选择要插入的数据 -->
-    <HcDialog
-        :loading="insertDataLoading" :show="insertDataShow" is-table is-to-body save-text="保存"
-        title="选择需要插入的数据" widths="84%" @close="cancelinsertData"
-        @save="submitinsertData"
+    <hc-new-dialog
+        v-model="insertDataShow" :loading="insertDataLoading" is-table save-text="保存"
+        title="选择需要插入的数据" widths="84%" @close="cancelinsertData" @save="submitinsertData"
     >
         <HcTestData
             v-if="insertDataShow" ref="insertDataRef" :contract-id="contract_id" :project-id="projectId"
             :table-id="itinsertTableId"
             :tree-id="itinsertTreeId"
         />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 关联试验文件 -->
     <HcDialog
-        :loading="fileModalLoading" :show="fileModal" is-table is-to-body save-text="保存" title="关联试验文件"
-        widths="84%" @close="fileModalClose"
-        @save="savefileModal"
+        v-model="fileModal" :loading="fileModalLoading" is-table save-text="保存" title="关联试验文件"
+        widths="84%" @close="fileModalClose" @save="savefileModal"
     >
         <HcTestFile
             v-if="fileModal" ref="testFileRefs" :contract-id="contract_id" :project-id="projectId"
@@ -245,24 +228,22 @@
     </HcDialog>
 
     <!-- 公式参数配置 -->
-    <HcDialog
-        :loading="formulaModalLoading" :show="formulaModal" is-to-body save-text="保存" title="公式参数配置"
-        widths="340px" @close="formulaModalClose"
-        @save="formulaSaveClick"
+    <hc-new-dialog
+        v-model="formulaModal" :loading="formulaModalLoading" save-text="保存" title="公式参数配置"
+        widths="340px" @close="formulaModalClose" @save="formulaSaveClick"
     >
         <HcFormula
             v-if="formulaModal" ref="formulaRefs" :key-name="tableFormItemNode.KeyName" :contract-id="contract_id"
             :formparent-id="formparentId"
             :pkey-id="tableFormItemNode.pkeyId" :project-id="projectId"
         />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 查看表单 -->
     <template v-for="(item, index) in DragModalTableForm" :key="index">
         <HcDragModal
             :close-icon-arr="closeIconArr" :eid="item.pkeyId" :height="DragModalHeight" :is-show="item.isShow"
-            :loading="item.loading" :loading-text="item.loadingText" :title="item.title"
-            is-sort-top
+            :loading="item.loading" :loading-text="item.loadingText" :title="item.title" is-sort-top
             @close="TableFormClose(item, index)" @closeIconTap="closeIconTap($event, item, index)"
         >
             <HcDragNode :more-menu="dragNodeMoreMenu" @menuTap="dragNodeMoreMenuTap($event, item)">
@@ -285,10 +266,9 @@
         </HcDragModal>
     </template>
     <!-- 复制本表 -->
-    <HcDialog
-        :loading="copyClickModalLoading" :show="showcopyModal" is-to-body save-text="确认复制" title="复制本表"
-        widths="84%" @close="copyModalClose"
-        @save="copySaveClick"
+    <hc-new-dialog
+        v-model="showcopyModal" :loading="copyClickModalLoading" save-text="确认复制" title="复制本表"
+        widths="84%" @close="copyModalClose" @save="copySaveClick"
     >
         <HcCopy
             v-if="showcopyModal" ref="copyRefs" :contract-id="contract_id" :project-id="projectId"
@@ -301,34 +281,24 @@
         <template #footer>
             <div class="lr-dialog-footer">
                 <div class="left flex items-center">
-                    <div class="mr-4">
-                        复制方式:
-                    </div>
+                    <div class="mr-4">复制方式:</div>
                     <el-radio-group v-model="CopyModalType">
-                        <el-radio label="1">
-                            跨节点复制
-                        </el-radio>
-                        <el-radio class="ml-4" label="2">
-                            本节点复制
-                        </el-radio>
+                        <el-radio label="1">跨节点复制</el-radio>
+                        <el-radio class="ml-4" label="2">本节点复制</el-radio>
                     </el-radio-group>
                 </div>
                 <div class="right">
-                    <el-button size="large" @click="showcopyModal = false">
-                        取消
-                    </el-button>
-                    <el-button :loading="copyClickModalLoading" hc-btn type="primary" @click="copySaveClick">
-                        确认复制
-                    </el-button>
+                    <el-button size="large" @click="showcopyModal = false">取消</el-button>
+                    <el-button :loading="copyClickModalLoading" hc-btn type="primary" @click="copySaveClick">确认复制</el-button>
                 </div>
             </div>
         </template>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 含水率 -->
-    <HcDialog is-to-body :show="waterModal" title="含水率" @close="waterModalClose" @save="waterSaveClick">
+    <hc-new-dialog v-model="waterModal" title="含水率" @close="waterModalClose" @save="waterSaveClick">
         <HcWater v-if="waterModal" ref="waterRefs" :key-name="tableFormItemNode.KeyName" :contract-id="contract_id" :design-strength="designStrength" :p-key-id="tableFormItemNode.pkeyId" />
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

src/views/data-fill/collapse-form/special-diaolg.vue

@@ -11,7 +11,7 @@
         </el-form-item>
     </el-form>
     <el-row :gutter="20" style="margin: -10px;">
-        <el-col v-for="item in specialCharacters" :span="3" style="padding: 10px;">
+        <el-col v-for="(item, index) in specialCharacters" :key="index" :span="3" style="padding: 10px;">
             <div class="special-box" @click="specialClick">
                 <span :title="`字符代码(C):${item !== 'K̅' ? item.slice(2, 7) : 'K̅'}`" class="font-EUDC" v-html="item" />
             </div>

src/views/data-fill/collapse-form/test-data.vue

@@ -1,19 +1,12 @@
 <template>
     <div>
         <div class="flex-1" style="padding-left:20px">
-            <HcNewSwitch
-                :datas="tabTypeTab" :keys="tabTypeKey" :round="false" size="default"
-                @change="tabTypeChange"
-            />
+            <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" :round="false" size="default" @change="tabTypeChange" />
             <el-select
                 v-model="testReportId" :loading="insertDataSelectoading" :placeholder="placeholderType"
-                class="ml-2 w-80"
-                clearable @change="testReportIdchange"
+                class="ml-2 w-80" clearable @change="testReportIdchange"
             >
-                <el-option
-                    v-for="item in testReportData" :key="item.pKeyId" :label="item.nodeName"
-                    :value="item.pKeyId"
-                />
+                <el-option v-for="item in testReportData" :key="item.pKeyId" :label="item.nodeName" :value="item.pKeyId" />
             </el-select>
         </div>
         <div class="dialog-table-box">

src/views/data-fill/collapse-form/test-diaolg.vue

@@ -16,7 +16,7 @@
         <div class="dialog-table-box">
             <div class="dialog-search">
                 <div class="w-64 ml-2">
-                    <HcDatePicker :dates="testBetweenTime" clearable @change="testBetweenTimeUpdate" />
+                    <hc-date-picker :dates="testBetweenTime" clearable @change="testBetweenTimeUpdate" />
                 </div>
                 <div class="ml-2">
                     <el-button type="primary" @click="testSearchClick">
@@ -26,14 +26,14 @@
                 </div>
             </div>
             <div class="dialog-table">
-                <HcTable :column="testDialogTableColumn" :datas="testDialogTableData" :loading="testDialogTableLoading" border>
+                <hc-table :column="testDialogTableColumn" :datas="testDialogTableData" :loading="testDialogTableLoading" border>
                     <template #reportNo="{ row }">
                         <span class="text-link" @click="testTableRowName(row)">{{ row?.reportNo }}</span>
                     </template>
-                </HcTable>
+                </hc-table>
             </div>
             <div class="dialog-pages">
-                <HcPages :pages="testSearchFormPage" @change="testSearchFormPageChange" />
+                <hc-pages :pages="testSearchFormPage" @change="testSearchFormPageChange" />
             </div>
         </div>
     </div>

src/views/data-fill/collapse-form/test-file.vue

@@ -21,8 +21,7 @@
                 />
                 <!-- 第三方树 -->
                 <ElTree
-                    v-else
-                    ref="ElTreeRef2" :data="thirdtreeDatas" :indent="0" :props="thirdElTreeProps"
+                    v-else ref="ElTreeRef2" :data="thirdtreeDatas" :indent="0" :props="thirdElTreeProps"
                     accordion class="hc-tree-node" highlight-current
                     node-key="id" @node-click="thirdtreeDatasElTreeClick"
                 />

src/views/data-fill/division.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <HcIcon name="stack" />
@@ -23,7 +23,7 @@
         </div>
         <div class="hc-page-content-box hc-division-page">
             <div class="basic-info">
-                <HcCard title="当前节点基础信息">
+                <HcNewCard title="当前节点基础信息">
                     <template #extra>
                         <el-checkbox
                             v-model="treeItemInfo.isConcealedWorksNode" :false-label="0"
@@ -38,10 +38,10 @@
                             {{ getRowMajorType(row.majorDataType) }}
                         </template>
                     </HcTable>
-                </HcCard>
+                </HcNewCard>
             </div>
             <div class="project-info">
-                <HcCard title="当前节点工程用表信息">
+                <hc-new-card title="当前节点工程用表信息">
                     <template #extra>
                         <el-button hc-btn type="primary" @click="addingFormClick">
                             <HcIcon name="add" />
@@ -64,9 +64,9 @@
                             </HcTooltip>
                         </template>
                     </HcTable>
-                </HcCard>
+                </hc-new-card>
             </div>
-            <div class="footer-box">
+            <div class="footer-box bg-white">
                 <el-button hc-btn color="#A16222" @click="downloadXlsx">
                     <HcIcon name="download-2" />
                     <span>下载导入划分模板</span>
@@ -83,14 +83,8 @@
         </div>
 
         <!-- 编辑节点 -->
-        <HcDialog
-            :loading="editNodeLoading" :show="editNodeModal" title="编辑节点"
-            widths="600px" @close="editNodeModal = false" @save="editNodeClick"
-        >
-            <el-form
-                ref="formEditNodeRef" :model="formEditNodeModel" :rules="formEditNodeRules" label-width="auto"
-                size="large"
-            >
+        <hc-new-dialog v-model="editNodeModal" :loading="editNodeLoading" title="编辑节点" widths="600px" @save="editNodeClick">
+            <el-form ref="formEditNodeRef" :model="formEditNodeModel" :rules="formEditNodeRules" label-width="auto" size="large">
                 <el-form-item label="节点名称" prop="title">
                     <el-input v-model="formEditNodeModel.title" placeholder="请输入节点名称" />
                 </el-form-item>
@@ -106,28 +100,20 @@
                     <el-input v-model="formEditNodeModel.partitionCode" placeholder="请输入划分编号" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 复制节点 -->
-        <HcDialog
-            :loading="copyNodeLoading" :show="copyNodeModal" :widths="copyNodeTabKey === '1' ? '600px' : '1200px'"
-            loading-text="复制节点中，请耐心等待..."
-            title="复制节点" @close="copyNodeModal = false"
+        <hc-new-dialog
+            v-model="copyNodeModal" :loading="copyNodeLoading" :widths="copyNodeTabKey === '1' ? '600px' : '1200px'"
+            loading-text="复制节点中，请耐心等待..." title="复制节点"
         >
             <div class="header-new-switch">
-                <el-form
-                    ref="formCopyNodeModelRef" :model="formCopyNodeModel" label-position="left"
-                    :rules="formCopyNodeModelRules" label-width="auto" size="large"
-                >
+                <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" label-position="left" :rules="formCopyNodeModelRules" label-width="auto" size="large">
                     <el-form-item label="是否复制数据" prop="isCopyData" style="margin-bottom: 0;">
                         <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
                         <el-radio-group v-model="isCopyData">
-                            <el-radio :label="1">
-                                是
-                            </el-radio>
-                            <el-radio :label="0">
-                                否
-                            </el-radio>
+                            <el-radio :label="1">是</el-radio>
+                            <el-radio :label="0">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item v-if="isCopyData === 1" label="所属方" prop="classify" style="margin-bottom: 0;">
@@ -142,26 +128,17 @@
                              @change="classifyTypeTabClick"/ -->
             </div>
             <div v-if="copyNodeTabKey === '1'" class="copy-node-form-box">
-                <el-form
-                    ref="formCopyNodeModelRef" :model="formCopyNodeModel"
-                    :rules="formCopyNodeModelRules" label-width="auto" size="large"
-                >
+                <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" :rules="formCopyNodeModelRules" label-width="auto" size="large">
                     <el-form-item v-if="copyNodeTabKey === '1'" label="节点名称" prop="title" style="margin-bottom: 0;">
                         <el-input v-model="formCopyNodeModel.title" placeholder="请输入节点名称" />
                     </el-form-item>
-                    <el-form-item
-                        v-if="copyNodeTabKey === '1'" label="划分编号" prop="partitionCode"
-                        style="margin-top: 10px;"
-                    >
+                    <el-form-item v-if="copyNodeTabKey === '1'" label="划分编号" prop="partitionCode" style="margin-top: 10px;">
                         <el-input v-model="formCopyNodeModel.partitionCode" placeholder="请输入划分编号" />
                     </el-form-item>
                 </el-form>
             </div>
             <div v-if="copyNodeTabKey === '3'" class="copy-node-form-box">
-                <el-form
-                    ref="formCopyNodeModelRef" :model="formCopyNodeModel"
-                    :rules="formCopyNodeModelRules" label-width="auto" size="large"
-                >
+                <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" :rules="formCopyNodeModelRules" label-width="auto" size="large">
                     <el-form-item label="所属方" prop="classify" style="margin-bottom: 0;">
                         <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
                         <el-checkbox-group v-model="classifyList">
@@ -174,10 +151,7 @@
             <div v-if="copyNodeTabKey !== '1'" class="copy-node-many-box">
                 <div class="copy-node-many-tree">
                     <el-scrollbar>
-                        <HcLazyTree
-                            :auto-expand-keys="TreeAutoExpandKeys" is-type
-                            @load="treeLoadNode" @nodeTap="copyNodeElTreeClick"
-                        />
+                        <HcLazyTree :auto-expand-keys="TreeAutoExpandKeys" is-type @load="treeLoadNode" @nodeTap="copyNodeElTreeClick" />
                     </el-scrollbar>
                 </div>
                 <div class="copy-node-many-table">
@@ -186,10 +160,7 @@
                             <el-table-column label="复制到的位置" prop="title" />
                             <el-table-column v-if="copyNodeTabKey === '2'" label="节点名称" prop="nodeName">
                                 <template #default="{ row }">
-                                    <el-form
-                                        ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules"
-                                        label-width="0" size="large"
-                                    >
+                                    <el-form ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules" label-width="0" size="large">
                                         <el-form-item prop="nodeName" style="margin-bottom: 0;">
                                             <el-input v-model="row.nodeName" placeholder="请输入节点名称" />
                                         </el-form-item>
@@ -198,10 +169,7 @@
                             </el-table-column>
                             <el-table-column v-if="copyNodeTabKey === '2'" label="划分编号" prop="partitionCode">
                                 <template #default="{ row }">
-                                    <el-form
-                                        ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules"
-                                        label-width="0" size="large"
-                                    >
+                                    <el-form ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules" label-width="0" size="large">
                                         <el-form-item prop="partitionCode" style="margin-bottom: 0;">
                                             <el-input v-model="row.partitionCode" placeholder="请输入划分编号" />
                                         </el-form-item>
@@ -210,9 +178,7 @@
                             </el-table-column>
                             <el-table-column align="center" label="操作" prop="action" width="120">
                                 <template #default="{ _, $index }">
-                                    <el-button plain type="danger" @click="copyNodeTableDel($index)">
-                                        删除
-                                    </el-button>
+                                    <el-button plain type="danger" @click="copyNodeTableDel($index)">删除</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -222,7 +188,7 @@
             <template #footer>
                 <div class="lr-dialog-footer">
                     <div class="left">
-                        <template v-for="item in copyNodeTab">
+                        <template v-for="(item, index) in copyNodeTab" :key="index">
                             <el-button
                                 v-if="item?.key === copyNodeTabKey" plain size="large" type="primary"
                                 @click="copyNodeTabChange(item?.key)"
@@ -235,93 +201,56 @@
                         </template>
                     </div>
                     <div class="right">
-                        <el-button :disabled="copyNodeLoading" size="large" @click="copyNodeModal = false">
-                            取消
-                        </el-button>
-                        <el-button :loading="copyNodeLoading" hc-btn type="primary" @click="copyNodeClick">
-                            提交
-                        </el-button>
+                        <el-button :disabled="copyNodeLoading" size="large" @click="copyNodeModal = false">取消</el-button>
+                        <el-button :loading="copyNodeLoading" hc-btn type="primary" @click="copyNodeClick">提交</el-button>
                     </div>
                 </div>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 新增子节点 -->
-        <HcDialog
-            :loading="addNodeLoading" :show="addNodeModal" loading-text="新增节点中，请耐心等待..."
-            title="新增子节点" widths="720px" @close="addNodeModal = false"
-        >
-            <el-alert
-                :closable="false" title="双击节点，可编辑节点名称，编辑完成后，请按回车或输入框消失后，再点提交"
-                type="warning"
-            />
+        <hc-new-dialog v-model="addNodeModal" :loading="addNodeLoading" loading-text="新增节点中，请耐心等待..." title="新增子节点" widths="720px">
+            <el-alert :closable="false" title="双击节点，可编辑节点名称，编辑完成后，请按回车或输入框消失后，再点提交" type="warning" />
             <HcTreeNode
                 v-if="addTreeNodeType === '1'" :node-id="addTreeNodeId" :old-id="addTreeNodeOldId" :contract-id="contractId"
                 :project-id="projectId" @check-change="addTreeNodeCheckChange"
             />
             <HcTreeNode
                 v-if="addTreeNodeType === '2'" :node-id="addTreeNodeId" :old-id="addTreeNodeOldId" :contract-id="contractId"
-                :project-id="projectId"
-                strictly @check-change="addTreeNodeCheckChange"
+                :project-id="projectId" strictly @check-change="addTreeNodeCheckChange"
             />
             <template #footer>
                 <div class="lr-dialog-footer">
                     <div class="left flex items-center">
-                        <div class="mr-4">
-                            选中方式:
-                        </div>
+                        <div class="mr-4">选中方式:</div>
                         <el-radio-group v-model="addTreeNodeType">
-                            <el-radio label="1">
-                                当前及子节点
-                            </el-radio>
-                            <el-radio class="ml-4" label="2">
-                                仅当前节点
-                            </el-radio>
+                            <el-radio label="1">当前及子节点</el-radio>
+                            <el-radio class="ml-4" label="2">仅当前节点</el-radio>
                         </el-radio-group>
                     </div>
                     <div class="right">
-                        <el-button size="large" @click="addNodeModal = false">
-                            取消
-                        </el-button>
-                        <el-button :loading="addNodeLoading" hc-btn type="primary" @click="addNodeClick">
-                            提交
-                        </el-button>
+                        <el-button size="large" @click="addNodeModal = false">取消</el-button>
+                        <el-button :loading="addNodeLoading" hc-btn type="primary" @click="addNodeClick">提交</el-button>
                     </div>
                 </div>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 调整排序 -->
-        <HcDialog
-            :loading="sortNodeLoading" :show="sortNodeModal" title="调整排序" widths="700px"
-            @close="sortNodeModal = false" @save="sortNodeClick"
-        >
+        <hc-new-dialog v-model="sortNodeModal" :loading="sortNodeLoading" title="调整排序" widths="700px" @save="sortNodeClick">
             <el-alert :closable="false" title="可拖动排序，也可在后面点击图标，切换排序" type="warning" />
             <div class="sort-node-body-box list-group header">
                 <div class="list-group-item">
-                    <div class="index-box">
-                        序号
-                    </div>
-                    <div class="title-box">
-                        节点名称
-                    </div>
-                    <div class="icon-box">
-                        排序
-                    </div>
+                    <div class="index-box">序号</div>
+                    <div class="title-box">节点名称</div>
+                    <div class="icon-box">排序</div>
                 </div>
             </div>
-            <Draggable
-                :list="sortNodeData" class="sort-node-body-box list-group" ghost-class="ghost" item-key="id"
-                @end="sortNodeDrag = false" @start="sortNodeDrag = true"
-            >
+            <Draggable :list="sortNodeData" class="sort-node-body-box list-group" ghost-class="ghost" item-key="id" @end="sortNodeDrag = false" @start="sortNodeDrag = true">
                 <template #item="{ element, index }">
                     <div class="list-group-item">
-                        <div class="index-box">
-                            {{ index + 1 }}
-                        </div>
-                        <div class="title-box">
-                            {{ element.title }}
-                        </div>
+                        <div class="index-box">{{ index + 1 }}</div>
+                        <div class="title-box">{{ element.title }}</div>
                         <div class="icon-box">
                             <span class="icon" @click="downSortClick(index)">
                                 <HcIcon name="arrow-down" ui="text-lg" />
@@ -333,13 +262,10 @@
                     </div>
                 </template>
             </Draggable>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入划分模板 -->
-        <HcDialog
-            :show="importTempModal" title="导入划分模板" ui="hc-modal-table" widths="84%"
-            @close="importTempModal = false"
-        >
+        <hc-new-dialog v-model="importTempModal" title="导入划分模板" ui="hc-modal-table" widths="84%">
             <div class="hc-import-temp-box">
                 <!-- div class="hc-choose-type-box">
                     <div class="text-title text-orange">请选择需要导入的工程类别：</div>
@@ -351,9 +277,7 @@
                 </div -->
                 <div v-loading="uploadLoading" class="hc-import-node-tree-box" element-loading-text="Loading...">
                     <div class="import-node-tree-box">
-                        <div class="hc-tree-title-box">
-                            导入并识别成功
-                        </div>
+                        <div class="hc-tree-title-box">导入并识别成功</div>
                         <div class="hc-tree-bar-box">
                             <el-scrollbar>
                                 <HcTreeData :datas="matchedData" />
@@ -361,9 +285,7 @@
                         </div>
                     </div>
                     <div class="import-node-tree-box">
-                        <div class="hc-tree-title-box">
-                            未被系统识别：手动关联
-                        </div>
+                        <div class="hc-tree-title-box">未被系统识别：手动关联</div>
                         <div class="hc-tree-bar-box">
                             <el-scrollbar>
                                 <HcTreeData1 :datas="unmatchedData" @relationTap="unmatchedTreeTap" />
@@ -393,32 +315,28 @@
                             <HcIcon name="close" />
                             <span>取消</span>
                         </el-button>
-                        <el-button
-                            :disabled="uploadLoading" :loading="uploadLoading" hc-btn type="primary"
-                            @click="importTempFolder"
-                        >
+                        <el-button :disabled="uploadLoading" :loading="uploadLoading" hc-btn type="primary" @click="importTempFolder">
                             <HcIcon name="folder-upload" />
                             <span>导入模板</span>
                         </el-button>
                     </div>
                 </div>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 替换并关联节点 -->
-        <HcDialog
-            :loading="relationLoading" :show="relationModal" save-text="确认关联" title="替换并关联节点"
-            ui="hc-modal-table"
-            widths="47rem" @close="relationModal = false" @save="relationSaveClick"
+        <hc-new-dialog
+            v-model="relationModal" :loading="relationLoading" save-text="确认关联" title="替换并关联节点"
+            ui="hc-modal-table" widths="47rem" @save="relationSaveClick"
         >
             <el-scrollbar>
                 <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" />
             </el-scrollbar>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 添加独立表单 -->
-        <HcDialog
-            :loading="addingFormLoading" :padding="false" :show="addingFormModal" is-table title="引用元素表"
+        <hc-new-dialog
+            v-model="addingFormModal" :loading="addingFormLoading" :padding="false" is-table title="引用元素表"
             widths="84%" @close="addingFormClose" @save="addingFormSave"
         >
             <div class="adding-form-dialog-box">
@@ -459,7 +377,7 @@
                     </div>
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/data-fill/wbs.vue

@@ -285,14 +285,8 @@
         </HcDragModal>
 
         <!-- 编辑节点 -->
-        <HcDialog
-            :loading="editNodeLoading" :show="editNodeModal" title="编辑节点" widths="600px"
-            @close="editNodeModal = false" @save="editNodeClick"
-        >
-            <el-form
-                ref="formEditNodeRef" :model="formEditNodeModel" :rules="formEditNodeRules" label-width="auto"
-                size="large"
-            >
+        <hc-new-dialog v-model="editNodeModal" :loading="editNodeLoading" title="编辑节点" widths="600px" @save="editNodeClick">
+            <el-form ref="formEditNodeRef" :model="formEditNodeModel" :rules="formEditNodeRules" label-width="auto" size="large">
                 <el-form-item label="节点名称" prop="title">
                     <el-input v-model="formEditNodeModel.title" placeholder="请输入节点名称" />
                 </el-form-item>
@@ -301,44 +295,33 @@
                 </el-form-item>
                 <el-form-item label="节点类型">
                     <el-select v-model="formEditNodeModel.nodeType" block disabled>
-                        <el-option v-for="item in nodeTypeData" :label="item.label" :value="item.value" />
+                        <el-option v-for="item in nodeTypeData" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="划分编号">
                     <el-input v-model="formEditNodeModel.partitionCode" placeholder="请输入划分编号" />
                 </el-form-item>
                 <el-form-item class="hc-position-input-icon" label="模板位置">
-                    <el-input
-                        v-model="formEditNodeModel.position" :autosize="{ minRows: 3, maxRows: 6 }"
-                        type="textarea"
-                    />
+                    <el-input v-model="formEditNodeModel.position" :autosize="{ minRows: 3, maxRows: 6 }" type="textarea" />
                     <el-tooltip content="一键复制模板位置">
                         <HcIcon name="file-copy-2" @click="copyPositionText(formEditNodeModel.position)" />
                     </el-tooltip>
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 复制节点 -->
-        <HcDialog
-            :loading="copyNodeLoading" :show="copyNodeModal" :widths="copyNodeTabKey === '1' ? '600px' : '1200px'"
-            loading-text="复制节点中，请耐心等待..."
-            title="复制节点" @close="copyNodeModal = false"
+        <hc-new-dialog
+            v-model="copyNodeModal" :loading="copyNodeLoading" :widths="copyNodeTabKey === '1' ? '600px' : '1200px'"
+            loading-text="复制节点中，请耐心等待..." title="复制节点"
         >
             <div class="header-new-switch">
-                <el-form
-                    ref="formCopyNodeModelRef" :model="formCopyNodeModel" label-position="left"
-                    :rules="formCopyNodeModelRules" label-width="auto" size="large"
-                >
+                <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" label-position="left" :rules="formCopyNodeModelRules" label-width="auto" size="large">
                     <el-form-item label="是否复制数据" prop="isCopyData" style="margin-bottom: 0;">
                         <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
                         <el-radio-group v-model="isCopyData">
-                            <el-radio :label="1">
-                                是
-                            </el-radio>
-                            <el-radio :label="0">
-                                否
-                            </el-radio>
+                            <el-radio :label="1">是</el-radio>
+                            <el-radio :label="0">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item v-if="isCopyData === 1" label="所属方" prop="classify" style="margin-bottom: 0;">
@@ -353,26 +336,17 @@
                              @change="classifyTypeTabClick"/ -->
             </div>
             <div v-if="copyNodeTabKey === '1'" class="copy-node-form-box">
-                <el-form
-                    ref="formCopyNodeModelRef" :model="formCopyNodeModel"
-                    :rules="formCopyNodeModelRules" label-width="auto" size="large"
-                >
+                <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" :rules="formCopyNodeModelRules" label-width="auto" size="large">
                     <el-form-item v-if="copyNodeTabKey === '1'" label="节点名称" prop="title" style="margin-bottom: 0;">
                         <el-input v-model="formCopyNodeModel.title" placeholder="请输入节点名称" />
                     </el-form-item>
-                    <el-form-item
-                        v-if="copyNodeTabKey === '1'" label="划分编号" prop="partitionCode"
-                        style="margin-top: 10px;"
-                    >
+                    <el-form-item v-if="copyNodeTabKey === '1'" label="划分编号" prop="partitionCode" style="margin-top: 10px;">
                         <el-input v-model="formCopyNodeModel.partitionCode" placeholder="请输入划分编号" />
                     </el-form-item>
                 </el-form>
             </div>
             <div v-if="copyNodeTabKey === '3'" class="copy-node-form-box">
-                <el-form
-                    ref="formCopyNodeModelRef" :model="formCopyNodeModel"
-                    :rules="formCopyNodeModelRules" label-width="auto" size="large"
-                >
+                <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" :rules="formCopyNodeModelRules" label-width="auto" size="large">
                     <el-form-item label="所属方" prop="classify" style="margin-bottom: 0;">
                         <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
                         <el-checkbox-group v-model="classifyList">
@@ -394,10 +368,7 @@
                             <el-table-column label="复制到的位置" prop="title" />
                             <el-table-column v-if="copyNodeTabKey === '2'" label="节点名称" prop="nodeName">
                                 <template #default="{ row }">
-                                    <el-form
-                                        ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules"
-                                        label-width="0" size="large"
-                                    >
+                                    <el-form ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules" label-width="0" size="large">
                                         <el-form-item prop="nodeName" style="margin-bottom: 0;">
                                             <el-input v-model="row.nodeName" placeholder="请输入节点名称" />
                                         </el-form-item>
@@ -406,10 +377,7 @@
                             </el-table-column>
                             <el-table-column v-if="copyNodeTabKey === '2'" label="划分编号" prop="partitionCode">
                                 <template #default="{ row }">
-                                    <el-form
-                                        ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules"
-                                        label-width="0" size="large"
-                                    >
+                                    <el-form ref="copyNodeTableRef" :model="row" :rules="copyNodeTableRules" label-width="0" size="large">
                                         <el-form-item prop="partitionCode" style="margin-bottom: 0;">
                                             <el-input v-model="row.partitionCode" placeholder="请输入划分编号" />
                                         </el-form-item>
@@ -418,9 +386,7 @@
                             </el-table-column>
                             <el-table-column align="center" label="操作" prop="action" width="120">
                                 <template #default="{ _, $index }">
-                                    <el-button plain type="danger" @click="copyNodeTableDel($index)">
-                                        删除
-                                    </el-button>
+                                    <el-button plain type="danger" @click="copyNodeTableDel($index)">删除</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -430,40 +396,22 @@
             <template #footer>
                 <div class="lr-dialog-footer">
                     <div class="left">
-                        <template v-for="item in copyNodeTab">
-                            <el-button
-                                v-if="item?.key === copyNodeTabKey" plain size="large" type="primary"
-                                @click="copyNodeTabChange(item?.key)"
-                            >
-                                {{ item.name }}
-                            </el-button>
-                            <el-button v-else bg size="large" text @click="copyNodeTabChange(item?.key)">
-                                {{ item.name }}
-                            </el-button>
+                        <template v-for="(item, index) in copyNodeTab" :key="index">
+                            <el-button v-if="item?.key === copyNodeTabKey" plain size="large" type="primary" @click="copyNodeTabChange(item?.key)">{{ item.name }}</el-button>
+                            <el-button v-else bg size="large" text @click="copyNodeTabChange(item?.key)">{{ item.name }}</el-button>
                         </template>
                     </div>
                     <div class="right">
-                        <el-button :disabled="copyNodeLoading" size="large" @click="copyNodeModal = false">
-                            取消
-                        </el-button>
-                        <el-button :loading="copyNodeLoading" hc-btn type="primary" @click="copyNodeClick">
-                            提交
-                        </el-button>
+                        <el-button :disabled="copyNodeLoading" size="large" @click="copyNodeModal = false">取消</el-button>
+                        <el-button :loading="copyNodeLoading" hc-btn type="primary" @click="copyNodeClick">提交</el-button>
                     </div>
                 </div>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 新增子节点 -->
-        <HcDialog
-            :loading="addNodeLoading" :show="addNodeModal" loading-text="新增节点中，请耐心等待..."
-            title="新增子节点"
-            widths="720px" @close="addNodeModal = false"
-        >
-            <el-alert
-                :closable="false" title="双击节点，可编辑节点名称，编辑完成后，请按回车或输入框消失后，再点提交"
-                type="warning"
-            />
+        <hc-new-dialog v-model="addNodeModal" :loading="addNodeLoading" loading-text="新增节点中，请耐心等待..." title="新增子节点" widths="720px">
+            <el-alert :closable="false" title="双击节点，可编辑节点名称，编辑完成后，请按回车或输入框消失后，再点提交" type="warning" />
             <HcTreeNode
                 v-if="addTreeNodeType === '1'"
                 :node-id="addTreeNodeId"
@@ -485,61 +433,35 @@
             <template #footer>
                 <div class="lr-dialog-footer">
                     <div class="left flex items-center">
-                        <div class="mr-4">
-                            选中方式:
-                        </div>
+                        <div class="mr-4">选中方式:</div>
                         <el-radio-group v-model="addTreeNodeType">
-                            <el-radio label="1">
-                                当前及子节点
-                            </el-radio>
-                            <el-radio class="ml-4" label="2">
-                                仅当前节点
-                            </el-radio>
+                            <el-radio label="1">当前及子节点</el-radio>
+                            <el-radio class="ml-4" label="2">仅当前节点</el-radio>
                         </el-radio-group>
                     </div>
                     <div class="right">
-                        <el-button size="large" @click="addNodeModal = false">
-                            取消
-                        </el-button>
-                        <el-button :loading="addNodeLoading" hc-btn type="primary" @click="addNodeClick">
-                            提交
-                        </el-button>
+                        <el-button size="large" @click="addNodeModal = false">取消</el-button>
+                        <el-button :loading="addNodeLoading" hc-btn type="primary" @click="addNodeClick">提交</el-button>
                     </div>
                 </div>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 调整排序 -->
-        <HcDialog
-            :loading="sortNodeLoading" :show="sortNodeModal" title="调整排序" widths="700px"
-            @close="sortNodeModal = false" @save="sortNodeClick"
-        >
+        <hc-new-dialog v-model="sortNodeModal" :loading="sortNodeLoading" title="调整排序" widths="700px" @save="sortNodeClick">
             <el-alert :closable="false" title="可拖动排序，也可在后面点击图标，切换排序" type="warning" />
             <div class="sort-node-body-box list-group header">
                 <div class="list-group-item">
-                    <div class="index-box">
-                        序号
-                    </div>
-                    <div class="title-box">
-                        节点名称
-                    </div>
-                    <div class="icon-box">
-                        排序
-                    </div>
+                    <div class="index-box">序号</div>
+                    <div class="title-box">节点名称</div>
+                    <div class="icon-box">排序</div>
                 </div>
             </div>
-            <Draggable
-                :list="sortNodeData" class="sort-node-body-box list-group" ghost-class="ghost" item-key="id"
-                @end="sortNodeDrag = false" @start="sortNodeDrag = true"
-            >
+            <Draggable :list="sortNodeData" class="sort-node-body-box list-group" ghost-class="ghost" item-key="id" @end="sortNodeDrag = false" @start="sortNodeDrag = true">
                 <template #item="{ element, index }">
                     <div class="list-group-item">
-                        <div class="index-box">
-                            {{ index + 1 }}
-                        </div>
-                        <div class="title-box">
-                            {{ element.title }}
-                        </div>
+                        <div class="index-box">{{ index + 1 }}</div>
+                        <div class="title-box">{{ element.title }}</div>
                         <div class="icon-box">
                             <span class="icon" @click="downSortClick(index)">
                                 <HcIcon name="arrow-down" ui="text-lg" />
@@ -551,7 +473,7 @@
                     </div>
                 </template>
             </Draggable>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 批量上报审批 -->
         <HcReportModal
@@ -569,29 +491,22 @@
         />
 
         <!-- 查看附件 -->
-        <HcDialog
-            :footer="false" :show="attachmentModal" is-table title="附件列表" widths="780px"
-            @close="attachmentModal = false"
-        >
+        <hc-new-dialog v-model="attachmentModal" :footer="false" is-table title="附件列表" widths="780px">
             <div v-if="attachmentList.length > 0" v-loading="attachmentListLoaing">
                 <div v-for="item in attachmentList " :key="item.id" class="hc-attachment-card">
-                    <div class="hc-attachment-header">
-                        {{ item?.nodeName }}
-                    </div>
+                    <div class="hc-attachment-header">{{ item?.nodeName }}</div>
                     <div class="hc-attachment-content">
                         <div v-for="item1 in item.fileList " :key="item1.id" class="hc-attachment-item">
                             <div class="hc-attachment-file-name">
                                 <HcIcon name="attachment" />
-                                <div class="name">
-                                    {{ item1?.name }}
-                                </div>
+                                <div class="name">{{ item1?.name }}</div>
                             </div>
                             <div class="hc-attachment-btn-box">
                                 <el-button plain size="small" type="primary" @click="previewFile(item1)">
                                     <HcIcon name="eye" />
                                     <span>预览</span>
                                 </el-button>
-                                <el-button v-if=" NodeStatus != 3" plain size="small" style="margin-left: 16px" type="danger" :loading="item1?.loading" @click="delFile(item1)">
+                                <el-button v-if="NodeStatus != 3" plain size="small" style="margin-left: 16px" type="danger" :loading="item1?.loading" @click="delFile(item1)">
                                     <HcIcon name="close" />
                                     <span>删除</span>
                                 </el-button>
@@ -603,13 +518,13 @@
             <div v-else style="height: 100%;width: 100%;">
                 <HcNoData />
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 附件添加 -->
         <!-- 上传文件 -->
-        <HcDialog :footer="false" :show="uploadModal" title="上传文件" widths="38rem" @close="uploadModalClose">
+        <hc-new-dialog v-model="uploadModal" :footer="false" title="上传文件" widths="38rem" @close="uploadModalClose">
             <HcUpload :datas="uploadData" :file-list="fileListData" :is-canupload="false" action="/api/blade-manager/exceltab/add-bussfile-node" accept="application/pdf" accept-tip="允许格式：pdf" @change="uploadChange" />
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

yarn.lock

@@ -1304,10 +1304,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^2.3.2:
-  version "2.3.2"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.3.2.tgz#382b694820b36ed653c3e40b3d7e7d1d0346938f"
-  integrity sha512-nmMIC0OcuFr1zaBIOnAZWruEtYvBcR8m7laUdSc6fsu18OoScYipNWbZ2S93VyAOlpYaOFC1idTzLEL+57CXhA==
+hc-vue3-ui@^2.3.3:
+  version "2.3.3"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.3.3.tgz#d627328fded4e5d2215b8bb7cbe2299c813eb819"
+  integrity sha512-0IBvxSh3uIVWXoCh1+V6Zgqw4fKqqvSSkyqwInY3A+8lZIlH31zAmrV542lCYj9HPpTIBAjtsXxtKY8yrQN4cg==
   dependencies:
     axios "^1.5.1"
     dayjs "^1.11.10"