refactor(table): 移除表格组件中的 canResize 属性

移除了多个组件中不必要的 canResize 属性，包括：
- LinkTableListModal.vue
- PositionSelectModal.vue
- RoleSelectModal.vue
- UserSelectByDepModal.vue
- UserSelectModal.vue
- componentSetting.ts
- UnionPayModel.vue
- index.vue (多个视图)
- Demo.vue (多个示例)
- signingList/index.vue
- evaluate/index.vue
- MiniProgramRoleRouter/index.vue
- address/index.vue
- DepartRoleInfoTab.vue
- DepartUserInfoTab.vue
- DictItemList.vue
- DictRecycleBinModal.vue
- examples/demo/index.vue

这个改动统一了表格组件的配置，消除了不必要的属性，提高了代码的可维护性。

src/components/Form/src/jeecg/components/JLinkTableCard/components/LinkTableListModal.vue

@@ -192,7 +192,7 @@
           showTableSetting: false,
           immediate: false,
           //showIndexColumn: true,
-          canResize: false,
+
           showActionColumn: false,
           actionColumn: {
             dataIndex: 'action',

src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue

@@ -75,7 +75,6 @@
       const attrs = useAttrs();
       //表格配置
       const config = {
-        canResize: false,
         bordered: true,
         size: 'small',
         //改成读取rowKey,自定义传递参数
@@ -102,12 +101,12 @@
         },
         //update-begin-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
         actionColOptions: {
-            xs: 24,
-            sm: 8,
-            md: 8,
-            lg: 8,
-            xl: 8,
-            xxl: 8,
+          xs: 24,
+          sm: 8,
+          md: 8,
+          lg: 8,
+          xl: 8,
+          xxl: 8,
         },
         //update-end-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
         schemas: [
@@ -144,7 +143,7 @@
         showIndexColumn: false,
         scroll: { y: 390 },
         size: 'small',
-        canResize: false,
+
         bordered: true,
         rowKey: 'id',
         columns: [

src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue

@@ -48,7 +48,6 @@
       const attrs = useAttrs();
       //表格配置
       const config = {
-        canResize: false,
         bordered: true,
         size: 'small',
         rowKey: unref(props).rowKey,

src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue

@@ -95,7 +95,7 @@
           },
         ],
         useSearchForm: true,
-        canResize: false,
+
         showIndexColumn: false,
         striped: true,
         bordered: true,
@@ -112,12 +112,12 @@
           },
           //update-begin-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
           actionColOptions: {
-              xs: 24,
-              sm: 12,
-              md: 12,
-              lg: 12,
-              xl: 8,
-              xxl: 8,
+            xs: 24,
+            sm: 12,
+            md: 12,
+            lg: 12,
+            xl: 8,
+            xxl: 8,
           },
           //update-end-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
           schemas: [
@@ -135,12 +135,12 @@
 
       function getTableList(params) {
         params = parseParams(params);
-        return getTableListOrigin({...params});
+        return getTableListOrigin({ ...params });
       }
 
       function queryDepartTreeSync(params) {
         params = parseParams(params);
-        return queryDepartTreeSyncOrigin({...params});
+        return queryDepartTreeSyncOrigin({ ...params });
       }
 
       /**
@@ -152,7 +152,7 @@
           return {
             ...params,
             ...props.params,
-          }
+          };
         }
         return params;
       }

src/components/Form/src/jeecg/components/modal/UserSelectModal.vue

@@ -13,7 +13,6 @@
       :centered="true"
       destroyOnClose
       @visible-change="visibleChange"
-      
     >
       <a-row>
         <a-col :span="showSelected ? 18 : 24">
@@ -112,7 +111,6 @@
       const attrs = useAttrs();
       //表格配置
       const config = {
-        canResize: false,
         bordered: true,
         size: 'small',
       };
@@ -126,7 +124,7 @@
       // update-begin--author:liaozhiyang---date:20230811---for：【issues/657】右侧选中列表删除无效
       watch(rowSelection.selectedRowKeys, (newVal) => {
         //update-begin---author:wangshuai ---date: 20230829  for：null指针异常导致控制台报错页面不显示------------
-        if(tableRef.value){
+        if (tableRef.value) {
           tableRef.value.setSelectedRowKeys(newVal);
         }
         //update-end---author:wangshuai ---date: 20230829 for：null指针异常导致控制台报错页面不显示------------
@@ -205,7 +203,7 @@
         showIndexColumn: false,
         scroll: { y: 390 },
         size: 'small',
-        canResize: false,
+
         bordered: true,
         rowKey: 'id',
         columns: [
@@ -234,22 +232,22 @@
           closeModal();
         });
       }
-      
+
       //update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
       /**
        * 用户返回结果逻辑查询
        */
       function afterFetch(record) {
         let excludeList = props.excludeUserIdList;
-        if(!excludeList){
+        if (!excludeList) {
           return record;
         }
-        let arr:any[] = [];
+        let arr: any[] = [];
         //如果存在过滤用户id集合，并且后台返回的数据不为空
-        if(excludeList.length>0 && record && record.length>0){
-          for(let item of record){
-            if(excludeList.indexOf(item.id)<0){
-              arr.push({...item})
+        if (excludeList.length > 0 && record && record.length > 0) {
+          for (let item of record) {
+            if (excludeList.indexOf(item.id) < 0) {
+              arr.push({ ...item });
             }
           }
           return arr;

src/settings/componentSetting.ts

@@ -9,7 +9,7 @@ export default {
     // 支持 xxx.xxx.xxx格式
     fetchSetting: {
       // 传给后台的当前页字段
-      pageField: 'pageNum',
+      pageField: 'pageNo',
       // 传给后台的每页显示多少条的字段
       sizeField: 'pageSize',
       // 接口返回表格数据的字段

src/views/AccountManagement/Merchant/components/UnionPayModel.vue

@@ -43,7 +43,7 @@
   //     title: 'Merchant',
   //     // api: list,
   //     columns,
-  //     canResize: false,
+  //
   //     formConfig: {
   //       autoSubmitOnEnter: true,
   //       showAdvancedButton: true,

src/views/AccountManagement/Merchant/index.vue

@@ -43,7 +43,7 @@
       title: 'Merchant',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/AccountManagement/accountManagement/index.vue

@@ -43,7 +43,7 @@
       title: 'nm_separate_accounts',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/businessManagement/competition/index.vue

@@ -55,6 +55,7 @@
     tableProps: {
       title: '赛场列表',
       api: list,
+
       columns: columns,
       formConfig: {
         // update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5873】查询区域lablel默认居左
@@ -82,7 +83,7 @@
     //   url: getImportUrl,
     // },
   });
-  const [registerTable, { reload, expandAll, collapseAll }] = tableContext;
+  const [registerTable, { reload }] = tableContext;
   const [registerModal, { openModal }] = useModal();
   function getTableAction(record) {
     return [

src/views/businessManagement/courses/index.vue

@@ -61,7 +61,7 @@
       title: 'courses',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/businessManagement/gymnasiumBag/index.vue

@@ -24,12 +24,7 @@
                 ></InputNumber>
               </FormItem>
               <FormItem label="时间段及费用" required :labelCol="{ xl: 2, sm: 3 }" :wrapper-col="{ span: 22 }">
-                <ZtCustomTable
-                  :key="item.value"
-                  :show-action="getIsMerchant"
-                  :tableColumn="ScheduleArrangementColums"
-                  v-model:value="model[item.value]"
-                >
+                <ZtCustomTable :show-action="getIsMerchant" :tableColumn="ScheduleArrangementColums" v-model:value="model[item.value]">
                 </ZtCustomTable>
               </FormItem>
             </Card>
@@ -53,7 +48,6 @@
 <script lang="ts" setup name="business-management-gymnasiumbag">
   import { TypographyTitle, Divider, InputNumber, FormItem, Card, message } from 'ant-design-vue';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
-  import { getSprotProject } from '/@/api/common/api';
   import { DemoOptionsItem } from '/@/api/demo/model/optionsModel';
   import ZtCustomTable from '/@/components/ZtCustomTable/index.vue';
   import { ScheduleArrangementColums } from './gymnasiumBag.data';
@@ -317,7 +311,7 @@
   }
 
   async function renderTable() {
-    projectList.value.forEach(async (it, idx) => {
+    projectList.value.forEach(async (it) => {
       await appendSchemaByField(
         {
           field: it.value,

src/views/businessManagement/gymnasiumNoFixed/index.vue

@@ -39,6 +39,7 @@
     tableProps: {
       title: '赛场列表',
       api: list,
+
       columns: columns,
       formConfig: {
         labelWidth: 100,

src/views/businessManagement/takeoutInsurance/index.vue

@@ -40,7 +40,7 @@
       title: 'insure_order_info',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         autoAdvancedCol: 5,

src/views/demo/document/table/ExpandTableDemo.vue

@@ -89,7 +89,7 @@
           titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
           columns: columns,
           rowKey: 'id',
-          canResize: false,
+
           expandRowByClick: true,
           actionColumn: {
             width: 160,

src/views/demo/document/table/FixedHeaderColumn.vue

@@ -70,7 +70,7 @@
           title: '固定头和列示例',
           api: demoListApi,
           columns: columns,
-          canResize: false,
+
           scroll: { y: 200 },
           actionColumn: {
             width: 160,

src/views/demo/jeecg/AsyncTreeTable.vue

@@ -19,7 +19,7 @@
   const [registerTable, { setLoading }] = useTable({
     rowKey: 'id',
     bordered: true,
-    canResize: false,
+
     // 树表格
     isTreeTable: true,
     showIndexColumn: true,

src/views/demo/jeecg/erplist/JeecgOrderCustomerList.vue

@@ -56,11 +56,11 @@
   const { prefixCls, tableContext } = useListPage({
     tableProps: {
       api: getCustomList,
-      tableSetting:{
-        cacheKey:'customer'
+      tableSetting: {
+        cacheKey: 'customer',
       },
       columns: customColumns,
-      canResize: false,
+
       useSearchForm: false,
       actionColumn: {
         width: 180,

src/views/demo/jeecg/erplist/JeecgOrderTicketList.vue

@@ -56,11 +56,11 @@
   const { prefixCls, tableContext } = useListPage({
     tableProps: {
       api: getTicketList,
-      tableSetting:{
-        cacheKey:'ticket'
+      tableSetting: {
+        cacheKey: 'ticket',
       },
       columns: ticketColumns,
-      canResize: false,
+
       useSearchForm: false,
       actionColumn: {
         width: 180,

src/views/demo/jeecg/erplist/index.vue

@@ -58,11 +58,11 @@
   const { tableContext } = useListPage({
     tableProps: {
       api: list,
-      tableSetting:{
-        cacheKey:'erp_main'
+      tableSetting: {
+        cacheKey: 'erp_main',
       },
       columns: columns,
-      canResize: false,
+
       rowSelection: { type: 'radio' },
       formConfig: {
         schemas: searchFormSchema,

src/views/demo/system/dept/index.vue

@@ -56,7 +56,7 @@
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
-        canResize: false,
+
         actionColumn: {
           width: 80,
           title: '操作',

src/views/demo/system/menu/index.vue

@@ -57,7 +57,7 @@
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
-        canResize: false,
+
         actionColumn: {
           width: 80,
           title: '操作',

src/views/demo/table/AntdTableSummary.vue

@@ -43,7 +43,7 @@
           },
         ];
       }
-      const getBasicColumns = () :BasicColumn[] => {
+      const getBasicColumns = (): BasicColumn[] => {
         return [
           {
             title: 'ID',
@@ -111,7 +111,6 @@
         columns: getBasicColumns(),
         summaryFunc: handleSummary,
         scroll: { x: 1000 },
-        canResize: false,
       });
 
       return {

src/views/demo/table/ExpandTable.vue

@@ -48,7 +48,7 @@
         titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: getBasicColumns(),
         rowKey: 'id',
-        canResize: false,
+
         expandRowByClick: true,
         actionColumn: {
           width: 160,

src/views/demo/table/FixedHeight.vue

@@ -29,7 +29,7 @@
         title: '定高/头部自定义',
         api: demoListApi,
         columns: getCustomHeaderColumns(),
-        canResize: false,
+
         scroll: { y: 100 },
       });
 

src/views/demo/table/FooterTable.vue

@@ -99,7 +99,6 @@
         showSummary: true,
         summaryFunc: handleSummary,
         scroll: { x: 1000 },
-        canResize: false,
       });
 
       return {

src/views/informationManagement/ContractList/index.vue

@@ -38,7 +38,7 @@
       title: 'ContractList',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/informationManagement/Insure/index.vue

@@ -55,7 +55,7 @@
       title: 'insure',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/informationManagement/cUserInfo/index.vue

@@ -34,7 +34,7 @@
       title: 'cUserInfo',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/informationManagement/hot/index.vue

@@ -39,7 +39,7 @@
       title: 'hot',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/informationManagement/projectList/index.vue

@@ -54,7 +54,7 @@
       title: 'project',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/informationManagement/protocol/index.vue

@@ -53,7 +53,7 @@
       title: 'protocol',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/monitor/route/components/RouteRecycleBinModal.vue

@@ -35,7 +35,7 @@
     showIndexColumn: false,
     pagination: false,
     tableSetting: { fullScreen: true },
-    canResize: false,
+
     actionColumn: {
       width: 150,
       title: '操作',

src/views/monitor/server/index.vue

@@ -13,7 +13,7 @@
       </a-tabs>
       <!--  update-begin---author:wangshuai ---date: 20230829 for：性能监控切换到磁盘监控再切回来报错列为空，不能用if判断------------>
       <BasicTable @register="registerTable" :searchInfo="searchInfo" :dataSource="dataSource" v-show="activeKey != 4">
-      <!--  update-end---author:wangshuai ---date: 20230829 for：性能监控切换到磁盘监控再切回来报错列为空，不能用if判断------------>
+        <!--  update-end---author:wangshuai ---date: 20230829 for：性能监控切换到磁盘监控再切回来报错列为空，不能用if判断------------>
         <template #tableTitle>
           <div slot="message"
             >上次更新时间：{{ lastUpdateTime }}
@@ -55,7 +55,7 @@
     showIndexColumn: false,
     bordered: true,
     pagination: false,
-    canResize: false,
+
     tableSetting: { fullScreen: true },
     rowKey: 'id',
   });

src/views/operationManagement/banner/index.vue

@@ -61,7 +61,7 @@
       title: 'nm_app_banner',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/operationManagement/feedback/index.vue

@@ -62,7 +62,7 @@
       title: 'feedback',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/orderManagement/order/index.vue

@@ -12,7 +12,7 @@
         <div class="ml3">下单时间：{{ record.createTime }}</div>
       </div>
       <div class="mt3 flex items-center border-b border-solid pb-3 h-90px" v-for="item in record.orderProInfoList" :key="item.id">
-        <Image :width="80" class="rounded-16px" :src="item.productImage" v-if="item.productImage" />
+        <Image :width="80" :height="80" class="rounded-16px" :src="item.productImage" v-if="item.productImage" />
         <div class="ml3">{{ item.productName }}</div>
       </div>
     </template>
@@ -29,7 +29,7 @@
     <template #user="{ record }">
       <div class="h-20px"></div>
       <div class="mt3 h-90px flex flex-col justify-center border-b border-solid" v-for="item in record.orderProInfoList" :key="item.id">
-        <div>{{ item.userName || '无' }}</div>
+        <div>{{ item.userName || item.ticketNo || '无' }}</div>
         <div class="text-gray">{{ item.userPhone }}</div>
       </div>
     </template>

src/views/orderManagement/order/order.data.ts

@@ -153,6 +153,9 @@ export const orderColum: TableColumnType[] = [
     title: '原价/元',
     align: 'center',
     width: 180,
+    customRender: ({ record }) => {
+      return record.originalPrice || 0;
+    },
   },
 
   {
@@ -202,7 +205,7 @@ export function getColumText(type: number) {
     },
     {
       dataIndex: 'isinCode',
-      title: '卷号',
+      title: '劵号',
       align: 'center',
       width: 180,
     },
@@ -241,7 +244,7 @@ export function getColumText(type: number) {
     colum = [
       {
         dataIndex: 'isinCode',
-        title: '卷号',
+        title: '劵号',
         align: 'center',
         width: 180,
       },
@@ -300,6 +303,21 @@ export function getColumText(type: number) {
       },
     });
   }
+  if (type == 3 || type == 4) {
+    colum = [...commonColum];
+    colum.splice(3, 0, {
+      dataIndex: 'isinCode',
+      title: '核验人员/使用照片',
+      align: 'center',
+      customRender: ({ record }) => {
+        const viewList: VNode[] = [];
+        record.isinList.forEach((it) => {
+          viewList.push(h('div', it.verifyUserName));
+        });
+        return h('div', viewList);
+      },
+    });
+  }
   console.log(colum, '数据');
 
   return colum;

src/views/safetyManagement/Seal/index.vue

@@ -37,7 +37,7 @@
       dataSource: [],
 
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/safetyManagement/Turnstile/index.vue

@@ -33,7 +33,7 @@
     tableProps: {
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/safetyManagement/signingList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle> </template>
       <!--操作栏-->
@@ -10,24 +10,35 @@
       </template>
     </BasicTable>
   </div>
+  <!-- PDF预览弹窗 -->
+  <!-- <BasicModal v-model="previewVisible" title="合同预览" width="80%" :showOkBtn="false" @cancel="previewVisible = false">
+   
+  </BasicModal> -->
+  <div v-show="previewVisible" class="absolute left-9999999999999">
+    <iframe :src="url" id="pdfPreviewIframe" frameborder="0" width="100%" height="550px" scrolling="auto"></iframe>
+  </div>
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, computed, unref } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useModal } from '/@/components/Modal';
+  import { reactive, ref } from 'vue';
+  import { BasicTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
+  import { BasicModal } from '/@/components/Modal';
   import { columns, searchFormSchema } from './signing.data';
   import { getViewUrl, list } from './signing.api';
+  import { getToken } from '/@/utils/auth';
+  import { useGlobSetting } from '/@/hooks/setting';
   const queryParam = reactive<any>({});
-  //注册model
-  const [registerModal, { openModal }] = useModal();
+  const previewVisible = ref(false);
+  const glob = useGlobSetting();
+  const url = ref(`${glob.domainUrl}/sys/common/pdf/pdfPreviewIframe`);
+
   //注册table数据
   const { tableContext } = useListPage({
     tableProps: {
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,
@@ -46,17 +57,18 @@
     },
   });
 
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable] = tableContext;
 
   /**
    * 编辑事件
    */
   async function handleEdit(record: Recordable) {
-    // const data = await getDetaile({ id: record.id });
-    console.log(record, 'record');
-
     const res = await getViewUrl({ signFlowId: record.signFlowId });
-    console.log(res, '阿斯顿撒打算');
+    if (res && res.length > 0 && res[0].downloadUrl) {
+      let iframe = document.getElementById('pdfPreviewIframe');
+      let json = { title: res[0].fileName, token: getToken(), url: res[0].downloadUrl };
+      iframe!.contentWindow.postMessage(json, '*');
+    }
   }
 
   /**
@@ -65,10 +77,10 @@
   function getTableAction(record) {
     return [
       {
-        label: '绑定场地',
+        label: '查看合同',
         onClick: handleEdit.bind(null, record),
         ifShow: () => {
-          return record.signFlowId;
+          return record.isSign;
         },
       },
     ];

src/views/safetyManagement/signingList/signing.data.ts

@@ -1,9 +1,5 @@
-import { storeToRefs } from 'pinia';
-import { Business } from '../../businessManagement/gymnasiumBag/gymnasiumBag.api';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { useUserStore } from '/@/store/modules/user';
-const { userInfo } = storeToRefs(useUserStore());
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -31,9 +27,14 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'isSign',
     customRender: ({ record }) => {
-      return record.deviceType === 1 ? '已签' : '未签';
+      return record.isSign === 1 ? '已签' : '未签';
     },
   },
+  {
+    title: '签署时间',
+    align: 'center',
+    dataIndex: 'signTime',
+  },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [

src/views/safetyManagement/userEvaluation/evaluate.data.ts

@@ -164,7 +164,6 @@ export const formSchema: FormSchema[] = [
   {
     label: '用户昵称',
     field: 'username',
-    required: true,
     component: 'Input',
     span: 12,
     componentProps: {
@@ -175,7 +174,6 @@ export const formSchema: FormSchema[] = [
     label: '评分',
     field: 'score',
     component: 'Input',
-    required: true,
 
     span: 12,
     componentProps: {
@@ -190,7 +188,6 @@ export const formSchema: FormSchema[] = [
     label: '评价内容',
     field: 'evaluateContent',
     component: 'Input',
-    required: true,
     span: 12,
     componentProps: {
       readonly: true,
@@ -201,7 +198,6 @@ export const formSchema: FormSchema[] = [
     field: 'imageList',
     component: 'Input',
     span: 12,
-    required: true,
 
     componentProps: {
       readonly: true,
@@ -226,7 +222,6 @@ export const formSchema: FormSchema[] = [
     field: 'createTime',
     component: 'Input',
     span: 12,
-    required: true,
     componentProps: {
       readonly: true,
     },
@@ -236,7 +231,6 @@ export const formSchema: FormSchema[] = [
     field: 'checkStatus',
     component: 'Input',
     span: 12,
-    required: true,
     componentProps: {
       readonly: true,
     },

src/views/safetyManagement/userEvaluation/index.vue

@@ -37,7 +37,7 @@
       title: 'evaluate',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/system/MiniProgramRoleRouter/index.vue

@@ -41,7 +41,7 @@
       title: 'MiniProgramRoleRouter',
       api: list,
       columns,
-      canResize: false,
+
       formConfig: {
         //labelWidth: 120,
         schemas: searchFormSchema,

src/views/system/address/index.vue

@@ -4,7 +4,7 @@
       <DepartLeftTree ref="leftTree" @select="onTreeSelect" />
     </a-col>
     <a-col :xl="18" :lg="24" :md="24" style="margin-bottom: 10px">
-      <div style="height: 100%;" class="address-book">
+      <div style="height: 100%" class="address-book">
         <!--引用表格-->
         <BasicTable @register="registerTable">
           <template #post="{ text }">
@@ -52,7 +52,7 @@
       formConfig: {
         schemas: searchFormSchema,
       },
-      canResize: false,
+
       actionColumn: null,
       showTableSetting: false,
       // 请求之前对参数做处理

src/views/system/departUser/components/DepartRoleInfoTab.vue

@@ -68,7 +68,7 @@
     tableProps: {
       api: departRoleList,
       columns: departRoleColumns,
-      canResize: false,
+
       formConfig: {
         labelWidth: 100,
         schemas: departRoleSearchFormSchema,

src/views/system/departUser/components/DepartUserInfoTab.vue

@@ -68,7 +68,7 @@
     tableProps: {
       api: departUserList,
       columns: userInfoColumns,
-      canResize: false,
+
       formConfig: {
         schemas: userInfoSearchFormSchema,
         baseColProps: adaptiveColProps,

src/views/system/dict/components/DictItemList.vue

@@ -4,12 +4,11 @@
       <template #tableTitle>
         <a-button type="primary" @click="handleCreate"> 新增</a-button>
       </template>
-      <template v-slot:bodyCell="{column, record, index}">
-        <template v-if="column.dataIndex ==='action'">
+      <template v-slot:bodyCell="{ column, record, index }">
+        <template v-if="column.dataIndex === 'action'">
           <TableAction :actions="getTableAction(record)" />
         </template>
       </template>
-     
     </BasicTable>
   </BasicDrawer>
   <DictItemModal @register="registerModal" @success="reload" :dictId="dictId" />
@@ -45,7 +44,7 @@
   };
   const [registerTable, { reload, setProps }] = useTable({
     //需要配置rowKey，否则会有警告
-    rowKey:'dictId',
+    rowKey: 'dictId',
     api: itemList,
     columns: dictItemColumns,
     formConfig: {
@@ -64,14 +63,14 @@
       schemas: dictItemSearchFormSchema,
       autoSubmitOnEnter: true,
       actionColOptions: {
-        span: 8
-      }
+        span: 8,
+      },
     },
     striped: true,
     useSearchForm: true,
     bordered: true,
     showIndexColumn: false,
-    canResize: false,
+
     immediate: false,
     actionColumn: {
       width: 100,

src/views/system/dict/components/DictRecycleBinModal.vue

@@ -54,7 +54,7 @@
     showIndexColumn: false,
     pagination: false,
     tableSetting: { fullScreen: true },
-    canResize: false,
+
     actionColumn: {
       width: 100,
       title: '操作',

src/views/system/examples/demo/index.vue

@@ -52,7 +52,7 @@
         <a-upload name="file" :showUploadList="false" :customRequest="(file) => handleImportXls(file, getImportUrl, reload)">
           <a-button preIcon="ant-design:import-outlined" type="primary">导入</a-button>
         </a-upload>
-        <a-button preIcon="ant-design:export-outlined" type="primary" @click="handleExportXls('单表示例', getExportUrl,exportParams)">导出</a-button>
+        <a-button preIcon="ant-design:export-outlined" type="primary" @click="handleExportXls('单表示例', getExportUrl, exportParams)">导出</a-button>
         <a-button preIcon="ant-design:filter" type="primary" @click="">高级查询</a-button>
         <a-button preIcon="ant-design:plus-outlined" type="primary" @click="openTab">打开Tab页</a-button>
         <a-button preIcon="ant-design:retweet-outlined" type="primary" @click="customSearch = !customSearch">{{
@@ -60,7 +60,7 @@
         }}</a-button>
         <a-button preIcon="ant-design:import-outlined" type="primary" @click="handleImport">弹窗导入</a-button>
 
-        <super-query :config="superQueryConfig" @search="handleSuperQuery"/>
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
 
         <a-dropdown v-if="checkedKeys.length > 0">
           <template #overlay>
@@ -81,12 +81,12 @@
         <TableAction :actions="getActions(record)" />
       </template>
     </BasicTable>
-    <DemoModal @register="registerModal" @success="reload" :isDisabled="isDisabled"/>
+    <DemoModal @register="registerModal" @success="reload" :isDisabled="isDisabled" />
     <JImportModal @register="registerModalJimport" :url="getImportUrl" online />
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, unref, reactive, toRaw, watch,computed } from 'vue';
+  import { ref, unref, reactive, toRaw, watch, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
   import DemoModal from './DemoModal.vue';
@@ -99,7 +99,7 @@
   import { useGo } from '/@/hooks/web/usePage';
   import { router } from '/@/router';
   import { filterObj } from '/@/utils/common/compUtils';
-  
+
   const go = useGo();
   const checkedKeys = ref<Array<string | number>>([]);
   const [registerModal, { openModal }] = useModal();
@@ -108,7 +108,7 @@
   const min = ref();
   const max = ref();
   const isDisabled = ref(false);
-  
+
   const [registerTable, { reload, setProps }] = useTable({
     title: '单表示例',
     api: getDemoList,
@@ -135,7 +135,7 @@
     bordered: true,
     showIndexColumn: false,
     tableSetting: { fullScreen: true },
-    canResize: false,
+
     rowKey: 'id',
     actionColumn: {
       width: 180,
@@ -159,13 +159,13 @@
     openModalJimport(true);
   }
 
-  const exportParams = computed(()=>{
+  const exportParams = computed(() => {
     let paramsForm = {};
     if (checkedKeys.value && checkedKeys.value.length > 0) {
       paramsForm['selections'] = checkedKeys.value.join(',');
     }
-    return filterObj(paramsForm)
-  })
+    return filterObj(paramsForm);
+  });
   /**
    * 操作列定义
    * @param record
@@ -194,7 +194,7 @@
    * 选择事件
    */
   function onSelectChange(selectedRowKeys: (string | number)[]) {
-    console.log("checkedKeys------>",checkedKeys)
+    console.log('checkedKeys------>', checkedKeys);
     checkedKeys.value = selectedRowKeys;
   }
 
@@ -289,13 +289,13 @@
   //自定义查询----end---------
 
   const superQueryConfig = reactive({
-    name:{ title: "名称", view: "text", type: "string", order: 1 },
-    sex:{ title: "性别", view: "list", type: "string", dictCode:'sex', order: 2 },
+    name: { title: '名称', view: 'text', type: 'string', order: 1 },
+    sex: { title: '性别', view: 'list', type: 'string', dictCode: 'sex', order: 2 },
   });
-  
+
   function handleSuperQuery(params) {
-    Object.keys(params).map(k=>{
-      queryParam[k] = params[k]
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
     });
     searchQuery();
   }

src/views/system/menu/DataRuleList.vue

@@ -66,7 +66,7 @@
     bordered: true,
     showIndexColumn: false,
     showTableSetting: false,
-    canResize: false,
+
     immediate: false,
     actionColumn: {
       width: 100,

src/views/system/role/components/RoleUserTable.vue

@@ -43,9 +43,9 @@
 
   const emit = defineEmits(['register', 'hideUserList']);
   const props = defineProps({
-    disableUserEdit: {type:Boolean,default:false}
-  })
-  
+    disableUserEdit: { type: Boolean, default: false },
+  });
+
   const checkedKeys = ref<Array<string | number>>([]);
   const roleId = ref('');
   const [registerBaseDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
@@ -76,7 +76,7 @@
     showIndexColumn: false,
     // 【issues/1064】列设置的 cacheKey
     tableSetting: { fullScreen: true, cacheKey: 'role_user_table' },
-    canResize: false,
+
     rowKey: 'id',
     actionColumn: {
       width: 180,
@@ -193,7 +193,7 @@
 
 <style scoped>
   /*update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】3、租户角色下,查询居左显示*/
-  :deep(.ant-form-item-control-input-content){
+  :deep(.ant-form-item-control-input-content) {
     text-align: left;
   }
   /*update-end---author:wangshuai ---date:20230703  for：【QQYUN-5685】3、租户角色下,查询居左显示*/

src/views/system/role/components/UseSelectModal.vue

@@ -1,5 +1,13 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="用户选择列表" width="1000px" @ok="handleSubmit" destroyOnClose @openChange="handleOpenChange">
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    title="用户选择列表"
+    width="1000px"
+    @ok="handleSubmit"
+    destroyOnClose
+    @openChange="handleOpenChange"
+  >
     <BasicTable @register="registerTable" :rowSelection="rowSelection" />
   </BasicModal>
 </template>
@@ -29,7 +37,6 @@
     showTableSetting: false,
     bordered: true,
     showIndexColumn: false,
-    canResize: false,
   });
   /**
    * 选择列配置

src/views/system/staff/components/staffModl.vue

@@ -1,7 +1,7 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :width="900" @ok="handleSubmit">
     <div class="px-4">
-      <BasicForm @register="registerForm" name="feedbackForm">
+      <BasicForm @register="registerForm">
         <template #title1>
           <TypographyTitle :level="4">基本信息</TypographyTitle>
           <Divider></Divider>
@@ -75,7 +75,7 @@
 
 <script lang="ts" setup>
   import { TypographyTitle, Divider, Textarea, FormItem } from 'ant-design-vue';
-  import { ref, computed, unref } from 'vue';
+  import { ref, unref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import JSelectRole from '/@/components/Form/src/jeecg/components/JSelectRole.vue';
@@ -93,7 +93,7 @@
   const isDetail = ref(false);
 
   //表单配置
-  const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField, getFieldsValue }] = useForm({
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField, getFieldsValue, updateSchema }] = useForm({
     labelWidth: 150,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -110,6 +110,8 @@
       await setFieldsValue({
         ...data.record,
       });
+      updateSchema([{ field: 'password', show: false }]);
+
       if (data.record.instructorId) {
         isShow.value = true;
       } else {

src/views/system/staff/staff.data.ts

@@ -102,7 +102,7 @@ export const formSchema: FormSchema[] = [
     show: false,
   },
   {
-    field: 'id',
+    field: 'title1',
     label: 'ID',
     component: 'Input',
     colSlot: 'title1',
@@ -174,7 +174,7 @@ export const formSchema: FormSchema[] = [
     slot: 'jSelectPosition',
   },
   {
-    field: 'id',
+    field: 'title2',
     label: 'ID',
     component: 'Input',
     colSlot: 'title2',

src/views/system/staff/staffList.vue

@@ -9,9 +9,12 @@
       </template> </BasicTable
   ></div>
   <staffModl @register="registerModal" @success="reload"></staffModl>
+  <!--修改密码-->
+  <PasswordModal @register="registerPasswordModal" @success="reload" />
 </template>
 
 <script setup lang="ts">
+  import PasswordModal from '@/views/system/user/PasswordModal.vue';
   import staffModl from './components/staffModl.vue';
   import { BasicTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
@@ -38,7 +41,7 @@
       },
       showIndexColumn: true,
       actionColumn: {
-        width: 120,
+        width: 180,
       },
       // rowSelection: null,
       //自定义默认排序
@@ -48,14 +51,17 @@
       },
     },
   });
-  const [registerTable, { reload, expandAll, collapseAll }] = tableContext;
-
+  const [registerTable, { reload }] = tableContext;
+  const [registerPasswordModal, { openModal: openPasswordModal }] = useModal();
   function handleAdd() {
     openModal(true, {
       isUpdate: false,
       showFooter: true,
     });
   }
+  function handleChangePassword(username) {
+    openPasswordModal(true, { username });
+  }
   /**
    * 操作栏
    */
@@ -66,6 +72,11 @@
         onClick: handleEdit.bind(null, record),
         auth: 'staff:edit',
       },
+      {
+        label: '修改密码',
+        onClick: handleChangePassword.bind(null, record.username),
+        auth: 'staff:edit',
+      },
       {
         label: '删除',
         onClick: handleDel.bind(null, record),

src/views/system/tableWhiteList/SysTableWhiteListList.vue

@@ -4,15 +4,13 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined">
-          新增
-        </a-button>
-<!--        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls">-->
-<!--          导出-->
-<!--        </a-button>-->
-<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">-->
-<!--          导入-->
-<!--        </j-upload-button>-->
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增 </a-button>
+        <!--        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls">-->
+        <!--          导出-->
+        <!--        </a-button>-->
+        <!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">-->
+        <!--          导入-->
+        <!--        </j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -30,139 +28,135 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction
-          :actions="getTableAction(record)"
-          :dropDownActions="getDropDownAction(record)"
-        />
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
     </BasicTable>
 
     <!-- 表单区域 -->
-    <SysTableWhiteListModal @register="registerModal" @success="handleSuccess"/>
+    <SysTableWhiteListModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 
 <script lang="ts" name="ahh-sysTableWhiteList" setup>
-import {BasicTable, TableAction} from '/@/components/Table';
-import {useModal} from '/@/components/Modal';
-import {useListPage} from '/@/hooks/system/useListPage'
-import SysTableWhiteListModal from './modules/SysTableWhiteListModal.vue'
-import {columns, searchFormSchema} from './SysTableWhiteList.data';
-import {batchDelete, deleteOne, getExportUrl, getImportUrl, list} from './SysTableWhiteList.api';
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import SysTableWhiteListModal from './modules/SysTableWhiteListModal.vue';
+  import { columns, searchFormSchema } from './SysTableWhiteList.data';
+  import { batchDelete, deleteOne, getExportUrl, getImportUrl, list } from './SysTableWhiteList.api';
 
-//注册model
-const [registerModal, {openModal}] = useModal();
-//注册table数据
-const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
-  tableProps: {
-    title: '系统表白名单',
-    api: list,
-    columns,
-    canResize: false,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-      showAdvancedButton: true,
+  //注册model
+  const [registerModal, { openModal }] = useModal();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '系统表白名单',
+      api: list,
+      columns,
+
+      formConfig: {
+        labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      actionColumn: {
+        width: 120,
+      },
+    },
+    exportConfig: {
+      name: '系统表白名单',
+      url: getExportUrl,
     },
-    actionColumn: {
-      width: 120,
+    importConfig: {
+      url: getImportUrl,
     },
-  },
-  exportConfig: {
-    name: "系统表白名单",
-    url: getExportUrl,
-  },
-  importConfig: {
-    url: getImportUrl
-  },
-})
+  });
 
-const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
-/**
- * 新增事件
- */
-function handleAdd() {
-  openModal(true, {
-    isUpdate: false,
-    showFooter: true,
-  });
-}
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
+  }
 
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true,
-    showFooter: true,
-  });
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
 
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  openModal(true, {
-    record,
-    isUpdate: true,
-    showFooter: false,
-  });
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
 
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({id: record.id}, reload);
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, reload);
+  }
 
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ids: selectedRowKeys.value}, reload);
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, reload);
+  }
 
-/**
- * 成功回调
- */
-function handleSuccess({isUpdate, values}) {
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess({ isUpdate, values }) {
+    reload();
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    }
-  ]
-}
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/system/tenant/pack/TenantPackUserModal.vue

@@ -39,10 +39,10 @@
     components: { BasicModal, BasicTable, TableAction, TenantUserSelectModal },
     setup() {
       //获取租户id
-      const getTenantId = computed(()=>{
+      const getTenantId = computed(() => {
         return tenantPackData.tenantId;
-      })
-      
+      });
+
       //套餐包信息
       const tenantPackData = reactive<any>({});
       //表单赋值
@@ -60,7 +60,7 @@
           api: queryTenantPackUserList,
           immediate: false,
           columns: tenantPackUserColumns,
-          canResize: false,
+
           useSearchForm: false,
           beforeFetch: (params) => {
             params.tenantId = tenantPackData.tenantId;
@@ -96,7 +96,7 @@
             popConfirm: {
               title: '是否确认移除',
               confirm: handleDelete.bind(null, record),
-            }
+            },
           },
         ];
       }

src/views/system/user/UserQuitModal.vue

@@ -50,7 +50,7 @@
       api: getQuitList,
       columns: recycleColumns,
       rowKey: 'id',
-      canResize: false,
+
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -104,7 +104,7 @@
 </script>
 
 <style scoped lang="less">
-:deep(.ant-popover-inner-content){
-  width: 185px !important;
-}
+  :deep(.ant-popover-inner-content) {
+    width: 185px !important;
+  }
 </style>

src/views/system/user/UserRecycleBinModal.vue

@@ -1,5 +1,13 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="用户回收站" :showOkBtn="false" width="1000px" destroyOnClose @fullScreen="handleFullScreen">
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    title="用户回收站"
+    :showOkBtn="false"
+    width="1000px"
+    destroyOnClose
+    @fullScreen="handleFullScreen"
+  >
     <BasicTable @register="registerTable" :rowSelection="rowSelection" :scroll="scroll">
       <!--插槽:table标题-->
       <template #tableTitle>
@@ -60,7 +68,7 @@
     showIndexColumn: false,
     pagination: true,
     tableSetting: { fullScreen: true },
-    canResize: false,
+
     actionColumn: {
       width: 150,
       title: '操作',