Merge branch 'master' of https://gitee.com/dmc_qq/etc-project

src/crud/components/UD.operation.vue

@@ -1,8 +1,8 @@
 <!-- 默认插槽值 -->
 <template>
-    <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+    <el-button v-if="isEdit" size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
     <!-- 弹出框提示 trigger="click" -->
-    <el-popover trigger="click" v-model:visible="scope.row.visible" placement="top" :width="160">
+    <el-popover v-if="isDelete" trigger="click" v-model:visible="scope.row.visible" placement="top" :width="160">
         <div>
             <div style="margin-bottom: 10px;">
                 <span>是否确认删除该条数据?</span>
@@ -34,6 +34,14 @@
             data: {
                 default: null,
                 type: Object
+            },
+            isEdit: {
+                default: true,
+                type: Boolean
+            },
+            isDelete: {
+                default: true,
+                type: Boolean
             }
         },
         data() { //字段

src/crud/index.vue

@@ -22,24 +22,27 @@
                 :width="item.width" :show-overflow-tooltip="!item.overflow" />
 
             <el-table-column :fixed="tableFrom.operateFixed ? 'right' : 'false'" :label="tableFrom.operateTitle"
-                width="150px">
+                :width="tableFrom.operateWidth ? tableFrom.operateWidth : '150px'">
                 <!-- 默认插槽值 -->
                 <template #default="scope">
-                    <ud-operation :scope="scope" :data="testData" @handleEdit="handleEdit" @handleDelete="handleDelete">
+                    <ud-operation :scope="scope" :data="testData" :isEdit="tableFrom.operate.edit"
+                        :isDelete="tableFrom.operate.delete" @handleEdit="handleEdit" @handleDelete="handleDelete">
                     </ud-operation>
                 </template>
             </el-table-column>
         </el-table>
         <!-- 分页组件 -->
-        <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
+        <el-pagination v-if="false" :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
         <!-- 对话框 -->
         <el-dialog v-model="dialogFormVisible" :title="`${title}`">
-
+            <!-- 是否自定义Dialog -->
+            <div v-if="tableFrom.customDialog">
+                
+            </div>
+            <!-- 系统内容 -->
             <el-form ref="ruleFormRef" :rules="rules" :model="form">
-
                 <el-form-item v-for="(item,index) in tableFrom.field" :label="item.label" :prop="item.prop"
                     :label-width="formLabelWidth">
-
                     <!-- 输入框 -->
                     <div style="width: 100%;" v-if="item.form.type === 'input'">
                         <el-input v-model="form[item.prop]" :type="item.itemType"
@@ -58,9 +61,7 @@
                             :value-format="item.form.valueFormat" :type="item.form.itemType"
                             :placeholder="item.form.placeholder" />
                     </div>
-
                 </el-form-item>
-
             </el-form>
 
             <template #footer>
@@ -140,10 +141,7 @@
     const rules = reactive(initRules)
 
     //搜索条件
-    let searchCondition = reactive({
-        name: '',
-        date: ''
-    })
+    let searchCondition = reactive(props.homeData ? props.homeData.search : [])
 
     //表单字段
     const form = ref(initForm)

src/data/cardAfter/cardFillDo.ts

@@ -6,6 +6,7 @@ export const Data = {
     },
     table: {
         style: '',
+        customDialog: false,
         extend: [{
             type: 'index',
             label: '序号',
@@ -92,9 +93,10 @@ export const Data = {
         operateTitle: '操作',
         operateFixed: true,
         isOperate: true,
+        operateWidth: '80px',
         operate: {
             edit: true,
-            delete: true
+            delete: false
         }
     }
 }

src/data/tableConfig.ts

@@ -4,6 +4,7 @@ export const cfg = {
     },
     table: { //table 样式配置
         style: '', //默认表格样式
+        border: false, //是否添加边框(默认false)
         extend: [{ //表头拓展
             type: '', //类型:selection,index,expand
             width: '', //表头宽度
@@ -26,10 +27,10 @@ export const cfg = {
                 }
             }
         ],
-        border: false, //是否添加边框(默认false)
+        isOperate: true, //是否为表格添加操作处(默认true)
         operateTitle: '', //操作栏标题
         operateFixed: false, //操作栏是否固定(默认false)
-        isOperate: true, //是否为表格添加操作处(默认true)
+        operateWidth: '', //操作栏宽度
         operate: {
             edit: true, //是否编辑
             delete: true //是否删除

src/layout/index.vue

@@ -40,7 +40,6 @@
               </TabContainer>
 
               <!-- 主体内容页面 -->
-
               <router-view name="key"></router-view>
 
               <!-- 路由缓存 https://blog.csdn.net/kDevelop/article/details/122036896 -->