暂存

src/components/PageContent/src/actions/action-changePwd.tsx

@@ -2,10 +2,10 @@ import { defineComponent } from "vue";
 import { actionProps } from "../types";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 
-const ActionUpdate = defineComponent({
-  name: "ActionUpdate",
+const ActionChangePwd = defineComponent({
+  name: "ActionChangePwd",
   props: actionProps,
-  emits: ["update"],
+  emits: ["changePwd"],
   setup(_, { emit }) {
     return () => (
       <el-button
@@ -13,10 +13,10 @@ const ActionUpdate = defineComponent({
         onClick={() => emit("changePwd")}
         link
         type="primary"
-        icon={useRenderIcon("edits")}
+        icon={useRenderIcon("unlock")}
       />
     );
   }
 });
 
-export default ActionUpdate;
+export default ActionChangePwd;

src/components/PageContent/src/actions/action-resetPwd.tsx

@@ -2,21 +2,47 @@ import { defineComponent } from "vue";
 import { actionProps } from "../types";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 
-const ActionUpdate = defineComponent({
-  name: "ActionUpdate",
-  props: actionProps,
-  emits: ["update"],
-  setup(_, { emit }) {
+const ActionDelete = defineComponent({
+  name: "ActionDelete",
+  props: {
+    ...actionProps,
+    row: {
+      type: Object as PropType<any>,
+      required: true
+    },
+    prop: {
+      type: String
+    },
+    delTooltip: {
+      type: String
+    }
+  },
+  emits: ["resetPwd"],
+  setup(props, { emit }) {
+    async function handleResetPwd() {
+      const { row } = props;
+
+      emit("resetPwd", row.id);
+    }
+
     return () => (
-      <el-button
-        class="reset-margin"
-        onClick={() => emit("resetPwd")}
-        link
-        type="primary"
-        icon={useRenderIcon("edits")}
+      <el-popconfirm
+        title={props.delTooltip || "是否确认删除"}
+        placement="top"
+        onConfirm={handleResetPwd}
+        v-slots={{
+          reference: () => (
+            <el-button
+              class="reset-margin"
+              link
+              type="primary"
+              icon={useRenderIcon("delete")}
+            />
+          )
+        }}
       />
     );
   }
 });
 
-export default ActionUpdate;
+export default ActionDelete;

src/components/PageContent/src/actions/index.ts

@@ -4,7 +4,7 @@ import Update from "./action-update";
 import Preview from "./action-preview";
 import Status from "./action-status";
 import ResetPwd from "./action-resetPwd";
-import ChangePwds from "./action-changePwd";
+import ChangePwd from "./action-changePwd";
 const Operation = {
   Create,
   Update,
@@ -12,7 +12,7 @@ const Operation = {
   Preview,
   Status,
   ResetPwd,
-  ChangePwds
+  ChangePwd
 };
 
 export { Operation };

src/components/PageContent/src/page-content.tsx

@@ -27,7 +27,9 @@ const PageConent = defineComponent({
     "updateBtnClick",
     "previewBtnClick",
     "statusBtnClick",
-    "selectionChange"
+    "selectionChange",
+    "changePwdBtnClick",
+    "resetPwdBtnClick"
   ],
   setup(props, { expose, emit, slots }) {
     //根据传入的api决定表格需要的操作
@@ -117,6 +119,24 @@ const PageConent = defineComponent({
               {...createActionProps("delete", apis)}
             />
           )}
+          {del && action.changePwd && powers.some(i => i == "012") && (
+            <Operation.ChangePwd
+              row={row}
+              prop={contentConfig.changePwdProp}
+              delTooltip={delTooltip}
+              onChangePwd={() => emit("changePwdBtnClick", row)}
+              {...createActionProps("changePwd", apis)}
+            />
+          )}
+          {del && action.resetPwd && powers.some(i => i == "013") && (
+            <Operation.ResetPwd
+              row={row}
+              prop={contentConfig.resetPwdProp}
+              delTooltip={delTooltip}
+              onResetPwd={() => emit("resetPwdBtnClick", row)}
+              {...createActionProps("resetPwd", apis)}
+            />
+          )}
         </>
       );
     }
@@ -132,9 +152,7 @@ const PageConent = defineComponent({
       return (
         <div style={{ display: "flex", gap: "5px" }}>
           {/* excel导出 */}
-
           {slots.header && slots.header()}
-
           {(slots.create && slots.create()) ||
             (action.create && powers.some(i => i == "003") && (
               <Operation.Create

src/components/PageContent/src/types.ts

@@ -21,6 +21,8 @@ export interface ContentConfig {
   notPreview?: boolean;
   statusProp?: string;
   deleteProp?: string;
+  changePwdProp?: string;
+  resetPwdProp?: string;
   mockData?: Array<any>;
   isTree?: boolean;
   treeProps?: any;
@@ -60,6 +62,8 @@ export interface ContentApis {
   httpDelete?: API;
   httpUpdate?: API;
   httpStatus?: API;
+  httpResetPwd?: API;
+  httpChangePwd?: API;
 }
 
 export type PageContentInstance = typeof PageContent & {

src/components/PageContent/src/utils/create-operation.tsx

@@ -4,7 +4,9 @@ export const mapActionToApi = {
   update: "httpUpdate",
   create: "httpAdd",
   delete: "httpDelete",
-  status: "httpStatus"
+  status: "httpStatus",
+  changePwd: "httpChangePwd",
+  resetPwd: "httpResetPwd"
 };
 
 /**

src/config/btnList.ts

@@ -10,14 +10,15 @@ const btnList = [
   { code: "009", name: "复制" },
   { code: "010", name: "上架" },
   { code: "011", name: "下架" },
-  { code: "012", name: "重置密码" },
-  { code: "013", name: "设为管理员" },
-  { code: "014", name: "取消管理员" },
-  { code: "015", name: "模板下载" },
-  { code: "016", name: "数据导入" },
-  { code: "017", name: "页面导出" },
-  { code: "018", name: "接口实时导出" },
-  { code: "019", name: "接口预约导出" },
+  { code: "012", name: "修改密码" },
+  { code: "013", name: "重置密码" },
+  { code: "014", name: "设为管理员" },
+  { code: "015", name: "取消管理员" },
+  { code: "016", name: "模板下载" },
+  { code: "017", name: "数据导入" },
+  { code: "018", name: "页面导出" },
+  { code: "019", name: "接口实时导出" },
+  { code: "020", name: "接口预约导出" },
   { code: "999", name: "批量设置采购单无需对账状态" }
 ];