htui-yllkbz 1.5.4 → 1.5.6

package/package.json

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

package/src/packages/HtDrawer/index.vue

@@ -4,12 +4,12 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-05-11 16:31:25
+ * @LastEditTime: 2023-05-23 13:54:34
 -->
 <template>
   <el-drawer
     :visible.sync="state.visible"
-    class="ht-new-drawer"
+    :class="htClass"
     :direction="direction"
     :custom-class="customClass"
     :append-to-body="appendToBody"
@@ -25,14 +25,16 @@
   >
     <span slot="title">
       <slot name="title"
-        ><span style="font-size:18px;font-weight:bold">{{ title }}</span></slot
+        ><span style="font-size:18px;font-weight:bold;color:#323433">{{
+          title
+        }}</span></slot
       >
     </span>
 
     <div
       style="overflow:hidden;padding:0 16px"
       :style="
-        `height:calc(100vh - ${withFooter ? '90px' : '0px'} - ${
+        `height:calc(100vh - ${withFooter ? '56px' : '0px'} - ${
           withHeader ? (htClass === 'ht-new-drawer' ? '60px' : '90px') : '0px'
         })`
       "
@@ -41,39 +43,61 @@
         <slot></slot>
       </el-scrollbar>
     </div>
-    <el-divider v-if="withFooter"></el-divider>
-    <slot name="foot" v-if="withFooter">
-      <div>
+    <!-- <el-divider v-if="withFooter"></el-divider> -->
+    <div style="margin-top:16px">
+      <slot name="foot" v-if="withFooter">
         <template v-if="!footerRight">
-          <el-button style="margin-left:20px" @click="onCancel">{{
-            cancelText
-          }}</el-button>
+          <template v-if="!readonly">
+            <el-button
+              style="margin-left:24px"
+              :disabled="disabled"
+              :loading="loading"
+              type="primary"
+              @click="onOk"
+              >{{ okText }}</el-button
+            >
+            <el-button
+              :loading="loading"
+              style="margin-left:16px"
+              @click="onCancel"
+              >{{ cancelText }}</el-button
+            >
+          </template>
           <el-button
-            style="margin-left:20px"
-            :disabled="disabled"
-            type="primary"
-            @click="onOk"
-            >{{ okText }}</el-button
+            v-else
+            :loading="loading"
+            style="margin-left:24px"
+            @click="onCancel"
+            >{{ cancelText }}</el-button
           >
         </template>
         <template v-else>
+          <template v-if="!readonly"
+            ><el-button
+              style="margin-right:24px;float:right"
+              type="primary"
+              :loading="loading"
+              :disabled="disabled"
+              @click="onOk"
+              >{{ okText }}</el-button
+            >
+            <el-button
+              :loading="loading"
+              style="margin-right:16px;float:right"
+              @click="onCancel"
+              >{{ cancelText }}</el-button
+            >
+          </template>
           <el-button
-            style="margin-right:20px;float:right"
-            type="primary"
+            v-else
             :loading="loading"
-            :disabled="disabled"
-            @click="onOk"
-            >{{ okText }}</el-button
-          >
-          <el-button
-            :loading="loading"
-            style="margin-right:20px;float:right"
+            style="margin-left:24px"
             @click="onCancel"
             >{{ cancelText }}</el-button
           >
         </template>
-      </div>
-    </slot>
+      </slot>
+    </div>
   </el-drawer>
 </template>
 <script lang="ts">
@@ -95,6 +119,7 @@ export default class Index extends Vue {
   @Prop() title!: string;
   @Prop() htClass!: string;
   @Prop() loading!: boolean;
+  @Prop() readonly!: boolean;
   /** 是否显示隐藏来自父级传参 */
   @Prop() value!: boolean;
   /** 展开方式 参考elemen UI */

package/src/packages/HtMore/index.vue

@@ -4,10 +4,15 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-25 09:45:13
+ * @LastEditTime: 2023-05-19 09:23:16
 -->
 <template>
-  <el-dropdown :trigger="trigger" @command="handleCommand($event, 'command')">
+  <el-dropdown
+    @click="$emit('click', $event)"
+    @visible-change="(e) => $emit('visible-change', e)"
+    :trigger="trigger"
+    @command="handleCommand($event, 'command')"
+  >
     <span class="el-dropdown-link" style="cursor:pointer;color:var(--primary)">
       <slot>
         <i class="ht-icon-more el-icon-more"></i>
@@ -18,51 +23,7 @@
       <el-dropdown-item v-if="!!showTabs.includes('edit')" command="edit"
         >编辑</el-dropdown-item
       >
-      <!-- <el-popconfirm
-          @confirm="handleCommand('delete', 'confirm')"
-          v-if="!!showTabs.includes('delete')"
-          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> -->
       <ht-popover
         @confirm="handleCommand('delete', 'confirm')"
         :tips="`删除后无法恢复,请确认是否删除${tips ? `【${tips}】` : ''}?`"

package/src/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2023-05-11 16:17:31
+ * @LastEditTime: 2023-05-23 13:57:00
 -->
 <template>
   <div>
@@ -68,7 +68,13 @@
         </template>
       </HtTable>
     </div>
-    <HtDrawer @onOk="submitTest()" v-model="state.visible" :title="'买买买'">
+    <HtDrawer
+      htClass="ht-new-drawer"
+      @onOk="submitTest()"
+      :footerRight="true"
+      v-model="state.visible"
+      :title="'买买买'"
+    >
       考了多少会计数控了分手快乐
     </HtDrawer>
   </div>