htui-yllkbz 1.4.21 → 1.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.4.21",
+  "version": "1.4.23",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",

package/src/packages/HtModel/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-23 14:24:26
+ * @LastEditTime: 2023-04-24 13:33:28
 -->
 <template>
   <el-dialog
@@ -69,7 +69,7 @@ interface State {
   visible: boolean;
 }
 @Component({
-  name: 'HtDrawer',
+  name: 'HtModel',
   components: {},
 })
 export default class Index extends Vue {

package/src/packages/HtMore/index.vue

@@ -4,33 +4,70 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-29 17:46:12
+ * @LastEditTime: 2023-04-24 10:16:37
 -->
 <template>
   <el-dropdown :trigger="trigger" @command="handleCommand($event, 'command')">
-    <span class="el-dropdown-link">
+    <span class="el-dropdown-link" style="cursor:pointer;color:var(--primary)">
       <slot>
         <i class="ht-icon-more el-icon-more"></i>
       </slot>
     </span>
     <el-dropdown-menu slot="dropdown">
-      <slot name="dropdown">
-        <el-dropdown-item v-if="!!showTabs.includes('edit')" command="edit"
-          >编辑</el-dropdown-item
-        >
-        <!-- <el-popconfirm
+      <slot name="dropdown"> </slot>
+      <el-dropdown-item v-if="!!showTabs.includes('edit')" command="edit"
+        >编辑</el-dropdown-item
+      >
+      <!-- <el-popconfirm
           @confirm="handleCommand('delete', 'confirm')"
           v-if="!!showTabs.includes('delete')"
-          :title="`请确认是否删除${tips ? `【${tips}】` : ''}?`"
-        > -->
-        <el-dropdown-item command="delete">删除</el-dropdown-item>
-        <!-- </el-popconfirm> -->
-      </slot>
+          icon="el-icon-warning"
+          icon-color="var(--danger)"
+          :title="`删除后无法回复,请确认是否删除${tips ? `【${tips}】` : ''}?`"
+        >
+          <el-dropdown-item slot="reference" command="delete"
+            >删除</el-dropdown-item
+          >
+        </el-popconfirm> -->
+      <el-popover
+        width="200"
+        trigger="click"
+        v-model="state.visible"
+        v-if="!!showTabs.includes('delete')"
+      >
+        <div>
+          <div style="display:flex;margin-top:12px">
+            <i
+              class="el-icon-warning"
+              style="color:var(--danger);font-size:16px"
+            ></i>
+            <p style="padding:0 0 0 6px;margin:0">
+              {{ `删除后无法回复,请确认是否删除${tips ? `【${tips}】` : ''}?` }}
+            </p>
+          </div>
+          <div style="text-align:right;width:100%;margin-top:16px">
+            <el-button
+              type="danger"
+              size="mini"
+              @click="handleCommand('delete', 'confirm')"
+              style=""
+              >确认删除</el-button
+            >
+            <el-button size="mini" @click="state.visible = false"
+              >取消</el-button
+            >
+          </div>
+        </div>
+
+        <el-dropdown-item slot="reference" command="delete"
+          >删除</el-dropdown-item
+        >
+      </el-popover>
     </el-dropdown-menu>
   </el-dropdown>
 </template>
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { Component, Prop, Vue } from 'vue-property-decorator';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -56,17 +93,18 @@ export default class Index extends Vue {
   /** 生命周期 */
   handleCommand(e: string, type: string) {
     if (type === 'command' && e === 'delete') {
-      this.$confirm(`请确认是否删除${this.tips ? `【${this.tips}】` : ''}?`)
-        .then((_) => {
-          this.handleCommand('delete', 'confirm');
-          //
-        })
-        .catch((_) => {
-          //
-        });
-
-      //不管
+      //console.log('111');
+      // this.$confirm(`请确认是否删除${this.tips ? `【${this.tips}】` : ''}?`)
+      //   .then((_) => {
+      //     this.handleCommand('delete', 'confirm');
+      //     //
+      //   })
+      //   .catch((_) => {
+      //     //
+      //   });
+      //不管1.4.2
     } else {
+      this.state.visible = false;
       this.$emit('callback', e);
     }
   }

package/src/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-23 14:02:59
+ * @LastEditTime: 2023-04-24 09:23:59
 -->
 <template>
   <div>
@@ -16,6 +16,7 @@
       <ht-col style="height:30px;border:1px solid #ccc" :span="4">iii</ht-col>
     </ht-row>
     <HtBread></HtBread>
+    <HtMore>操作</HtMore>
     <!-- <HtSelectOrg :multiple="false"></HtSelectOrg> -->
     <!-- <el-button type=""
                @click="test">test</el-button> -->
@@ -83,6 +84,7 @@ import HtCol from '@/packages/HtCol/index.vue';
 import { Column } from '@/packages/type';
 import HtModel from '@/packages/HtModel';
 import HtBread from '@/packages/HtBread';
+import HtMore from '@/packages/HtMore';
 import { getSpanMethod } from '@/packages/HtTable/table-span-method';
 
 interface State {
@@ -105,6 +107,7 @@ interface State {
     HtCol,
     HtBread,
     HtModel,
+    HtMore,
   },
 })
 export default class Index extends Vue {