yahee-components 0.0.114 → 0.0.115

package/es/operation-log/operation-log.vue2.js

@@ -1,23 +1,23 @@
-import { defineComponent as _, toRefs as F, ref as o, reactive as H, onMounted as K } from "vue";
-import { CaretLeft as T, CaretRight as V } from "@element-plus/icons-vue";
-import { ElMessage as l, ElButton as k, ElIcon as q, ElScrollbar as j } from "element-plus";
+import { defineComponent as Y, toRefs as G, ref as s, reactive as z, onMounted as J, nextTick as Q } from "vue";
+import { CaretLeft as W, CaretRight as X } from "@element-plus/icons-vue";
+import { ElMessage as g, ElButton as Z, ElIcon as ee, ElScrollbar as te } from "element-plus";
 import "element-plus/theme-chalk/src/base.scss";
 import "element-plus/theme-chalk/src/badge.scss";
 import "element-plus/theme-chalk/src/message.scss";
 import "element-plus/theme-chalk/src/scrollbar.scss";
 import "element-plus/theme-chalk/src/button.scss";
-import { useUpload as A } from "../packages/components/hooks/useUpload.js";
-import { useFile as R } from "../packages/components/hooks/useImg.js";
-import Y from "./operation-log-form.vue.js";
-import G from "./operation-log-content.vue.js";
-import z from "./operation-log-dialog.vue.js";
-import J from "../_virtual/dayjs.min.js";
-import { M2 as s } from "../utils/translate.js";
-import Q from "../annex-upload/annex-upload.vue.js";
-import W from "../node_modules/.pnpm/v3-infinite-loading@1.3.2/node_modules/v3-infinite-loading/lib/v3-infinite-loading.es.js";
+import { useUpload as oe } from "../packages/components/hooks/useUpload.js";
+import { useFile as ne } from "../packages/components/hooks/useImg.js";
+import se from "./operation-log-form.vue.js";
+import ae from "./operation-log-content.vue.js";
+import ie from "./operation-log-dialog.vue.js";
+import le from "../_virtual/dayjs.min.js";
+import { M2 as a } from "../utils/translate.js";
+import re from "../annex-upload/annex-upload.vue.js";
+import ge from "../node_modules/.pnpm/v3-infinite-loading@1.3.2/node_modules/v3-infinite-loading/lib/v3-infinite-loading.es.js";
 /* empty css                                                                                             */
-import { findGlobalNotes as X, insertGlobalnotes as x } from "../packages/components/api/log/index.js";
-const be = /* @__PURE__ */ _({
+import { findGlobalNotes as ce, insertGlobalnotes as P } from "../packages/components/api/log/index.js";
+const Oe = /* @__PURE__ */ Y({
   name: "YaheeOperationLog",
   __name: "operation-log",
   props: {
@@ -26,112 +26,123 @@ const be = /* @__PURE__ */ _({
     topHeight: { type: Number, required: !1, default: 90 },
     ifShowDocument: { type: Boolean, required: !1, default: !0 }
   },
-  setup(D, { expose: E }) {
-    E();
-    const a = D, { ifShowDocument: M } = F(a), u = o(!1), h = o(!1), c = o(!1), b = o({}), i = H({
+  setup(U, { expose: _ }) {
+    _();
+    const n = U, { ifShowDocument: A } = G(n), c = s(!1), I = s(!1), h = s(!1), N = s({}), i = z({
       List: [],
       LoginId: 0
-    }), p = o(""), d = o([]), n = {
+    }), p = s(""), d = s([]), o = {
       PageIndex: -1,
       StartOn: "",
       EndOn: "",
       Notes: "",
       Mark: null,
       UserIds: []
-    }, r = () => {
-      u.value = !0;
+    }, l = () => {
+      c.value = !0;
       const e = new FormData();
       e.append(
         "filter",
         JSON.stringify({
-          BusinessKey: a.businessKey,
-          BusinessName: a.businessName,
-          PageIndex: n.PageIndex,
-          StartOn: n.StartOn,
-          EndOn: n.EndOn,
-          UserIds: n.UserIds,
-          Notes: n.Notes,
-          Mark: n.Mark
+          BusinessKey: n.businessKey,
+          BusinessName: n.businessName,
+          PageIndex: o.PageIndex,
+          StartOn: o.StartOn,
+          EndOn: o.EndOn,
+          UserIds: o.UserIds,
+          Notes: o.Notes,
+          Mark: o.Mark
         })
-      ), X(e).then((t) => {
-        var g;
-        i.LoginId = t.LoginId, n.PageIndex === 0 ? i.List = t.List || [] : i.List = [...i.List || [], ...t.List || []], ((g = t == null ? void 0 : t.List) == null ? void 0 : g.length) === 0 && (h.value = !0);
+      ), ce(e).then((t) => {
+        var r;
+        i.LoginId = t.LoginId, o.PageIndex === 0 ? i.List = t.List || [] : i.List = [...i.List || [], ...t.List || []], ((r = t == null ? void 0 : t.List) == null ? void 0 : r.length) === 0 && (I.value = !0);
       }).finally(() => {
-        u.value = !1;
+        c.value = !1;
       });
-    }, L = () => {
-      u.value || (u.value = !0, n.PageIndex += 1, r());
-    }, O = (e) => {
-      i.List = [], n.PageIndex = 0, n.StartOn = e.timeValue ? e.timeValue[0] : "", n.EndOn = e.timeValue ? e.timeValue[1] : "", n.UserIds = e.CreatedBy ? [e.CreatedBy] : [], n.Notes = e.search, n.Mark = e.Mark, r();
-    }, B = () => {
-      d.value.length > 0 && m(d.value[0]).then(async () => {
-        l.success(s("上传文件成功！")), n.PageIndex = 0, d.value = [], await r(), f();
+    }, w = () => {
+      c.value || (c.value = !0, o.PageIndex += 1, l());
+    }, T = (e) => {
+      i.List = [], o.PageIndex = 0, o.StartOn = e.timeValue ? e.timeValue[0] : "", o.EndOn = e.timeValue ? e.timeValue[1] : "", o.UserIds = e.CreatedBy ? [e.CreatedBy] : [], o.Notes = e.search, o.Mark = e.Mark, l();
+    }, k = () => {
+      d.value.length > 0 && H(d.value[0]).then(async () => {
+        g.success(a("上传文件成功！")), o.PageIndex = 0, d.value = [], await l(), y();
       });
-    }, S = (e) => {
-      m(e).then(() => {
-        l.success(s("上传文件成功！")), c.value = !1, n.PageIndex = 0, r();
+    }, K = (e) => {
+      H(e).then(() => {
+        g.success(a("上传文件成功！")), h.value = !1, o.PageIndex = 0, l();
       });
-    }, m = (e) => {
+    }, H = (e) => {
       const t = new FormData();
-      return t.append("BusinessKey", a.businessKey), t.append("BusinessName", a.businessName), t.append("notes", e.fileUrl), t.append("ViewTitle", e.fileName), x(t);
-    }, w = () => {
+      return t.append("BusinessKey", n.businessKey), t.append("BusinessName", n.businessName), t.append("notes", e.fileUrl), t.append("ViewTitle", e.fileName), P(t);
+    }, q = () => {
       if (!p.value) {
-        l.info(s("备注不能为空！"));
+        g.info(a("备注不能为空！"));
         return;
       }
       const e = new FormData();
-      e.append("BusinessKey", a.businessKey), e.append("BusinessName", a.businessName), e.append("notes", p.value), e.append("ViewTitle", "备注"), x(e).then(async () => {
-        l.success(s("添加备注成功！")), n.PageIndex = 0, p.value = "", await r(), f();
+      e.append("BusinessKey", n.businessKey), e.append("BusinessName", n.businessName), e.append("notes", p.value), e.append("ViewTitle", "备注"), P(e).then(async () => {
+        g.success(a("添加备注成功！")), o.PageIndex = 0, p.value = "", await l(), y();
       });
-    }, P = (e) => {
+    }, V = (e) => {
       if (e.clipboardData || e.originalEvent) {
         if (e.clipboardData.items.length === 0) {
-          l.error(s("复制文件到剪切板失败，请点击按钮上传！"));
+          g.error(a("复制文件到剪切板失败，请点击按钮上传！"));
           return;
         }
         if (e.clipboardData.files.length > 0) {
-          c.value = !0;
+          h.value = !0;
           for (let t = 0; t < e.clipboardData.files.length; t++) {
-            e.clipboardData.files[t].size / 1024 / 1024 < 100 || l.error(s("上传文件大小不能超过 100MB!"));
-            const { name: C } = e.clipboardData.files[t];
-            A("115", e.clipboardData.files[t]).then((U) => {
-              b.value = {
-                fileName: C || "",
-                fileUrl: R({ fileId: U[0] })
+            e.clipboardData.files[t].size / 1024 / 1024 < 100 || g.error(a("上传文件大小不能超过 100MB!"));
+            const { name: m } = e.clipboardData.files[t];
+            oe("115", e.clipboardData.files[t]).then((b) => {
+              N.value = {
+                fileName: m || "",
+                fileUrl: ne({ fileId: b[0] })
               };
             }).catch(() => {
             });
           }
         }
       }
-    }, y = o(null), f = () => {
-      y.value.scrollTo({ top: 0, behavior: "smooth" });
-    }, v = o(0), I = o(null);
-    K(() => {
-      var t;
-      const e = (t = document.getElementsByClassName("log-form")[0]) == null ? void 0 : t.clientHeight;
-      v.value = window.innerHeight - e - I.value.offsetHeight - a.topHeight, L();
+    }, E = s(null), y = () => {
+      E.value.scrollTo({ top: 0, behavior: "smooth" });
+    }, M = s(0), u = s(null);
+    J(() => {
+      var r, m;
+      console.log("=== onMounted 触发（DOM 已挂载但布局未完成）===");
+      const e = (r = document.getElementsByClassName("log-form")[0]) == null ? void 0 : r.clientHeight, t = (m = u.value) == null ? void 0 : m.offsetHeight;
+      console.log("【nextTick 前】logFormHeight:", e, "| textAreaHeight:", t), Q(() => {
+        var D, O;
+        const b = (D = document.getElementsByClassName("log-form")[0]) == null ? void 0 : D.clientHeight, $ = (O = u.value) == null ? void 0 : O.offsetHeight;
+        console.log("【nextTick 后】logFormHeight:", b, "| textAreaHeight:", $), requestAnimationFrame(() => {
+          var S, F, C;
+          const f = (S = document.getElementsByClassName("log-form")[0]) == null ? void 0 : S.clientHeight, v = (F = u.value) == null ? void 0 : F.offsetHeight, x = window.innerHeight, L = (C = document.querySelector(".yahee-operation-log")) == null ? void 0 : C.parentElement, j = L == null ? void 0 : L.clientHeight;
+          console.log("【rAF 后 — 最终计算】"), console.log("window.innerHeight:", x), console.log("logFormHeight:", f), console.log("textAreaHeight:", v), console.log("props.topHeight:", n.topHeight), console.log("父容器 clientHeight:", j), console.log(`算式: ${x} - ${f} - ${v} - ${n.topHeight}`);
+          const R = x - f - v - n.topHeight;
+          console.log(`结果: ${R}`), console.log("============================="), M.value = window.innerHeight - f - u.value.offsetHeight - n.topHeight, w();
+        });
+      });
     });
-    const N = { props: a, ifShowDocument: M, loading: u, noMore: h, showDialog: c, docInfo: b, dataList: i, textareaText: p, compAnalysisFile: d, params: n, getLogMessage: r, load: L, filterChange: O, change: B, confirmUpload: S, uploadFile: m, sendEditQuill: w, handlePaste: P, infiniteList: y, scrollTop: f, boxHeight: v, logText: I, get CaretRight() {
-      return V;
+    const B = { props: n, ifShowDocument: A, loading: c, noMore: I, showDialog: h, docInfo: N, dataList: i, textareaText: p, compAnalysisFile: d, params: o, getLogMessage: l, load: w, filterChange: T, change: k, confirmUpload: K, uploadFile: H, sendEditQuill: q, handlePaste: V, infiniteList: E, scrollTop: y, boxHeight: M, logText: u, get CaretRight() {
+      return X;
     }, get CaretLeft() {
-      return T;
+      return W;
     }, get ElScrollbar() {
-      return j;
+      return te;
     }, get ElIcon() {
-      return q;
+      return ee;
     }, get ElButton() {
-      return k;
-    }, OperationLogForm: Y, OperationLogContent: G, OperationLogDialog: z, get dayjs() {
-      return J;
+      return Z;
+    }, OperationLogForm: se, OperationLogContent: ae, OperationLogDialog: ie, get dayjs() {
+      return le;
     }, get M2() {
-      return s;
-    }, YaheeAnnexUpload: Q, get InfiniteLoading() {
-      return W;
+      return a;
+    }, YaheeAnnexUpload: re, get InfiniteLoading() {
+      return ge;
     } };
-    return Object.defineProperty(N, "__isScriptSetup", { enumerable: !1, value: !0 }), N;
+    return Object.defineProperty(B, "__isScriptSetup", { enumerable: !1, value: !0 }), B;
   }
 });
 export {
-  be as default
+  Oe as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yahee-components",
   "private": false,
-  "version": "0.0.114",
+  "version": "0.0.115",
   "description": "深圳前海亚讯前端组件库",
   "main": "lib",
   "module": "es",

package/types/src/operation-log/operation-log.vue.d.ts

@@ -1,5 +1,5 @@
+import { nextTick, DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, ExtractPropTypes, GlobalComponents, GlobalDirectives, ComponentInternalInstance, StyleValue, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, PropType, Ref, DebuggerEvent, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties } from 'vue';
 import { OperationLogProps } from './operation-log';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, ExtractPropTypes, GlobalComponents, GlobalDirectives, ComponentInternalInstance, StyleValue, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, PropType, Ref, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties } from 'vue';
 import { ScrollbarDirection } from 'element-plus';
 import { OnCleanup } from '@vue/reactivity';
 declare const _default: DefineComponent<OperationLogProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<OperationLogProps> & Readonly<{}>, {
@@ -247,7 +247,7 @@ declare const _default: DefineComponent<OperationLogProps, {}, {}, {}, {}, Compo
             errorCaptured?: ((err: unknown, instance: ComponentPublicInstance | null, info: string) => boolean | void) | ((err: unknown, instance: ComponentPublicInstance | null, info: string) => boolean | void)[];
         };
         $forceUpdate: () => void;
-        $nextTick: nextTick;
+        $nextTick: typeof nextTick;
         $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (...args: [R, R, OnCleanup]) => any : (...args: [any, any, OnCleanup]) => any, options?: WatchOptions): WatchStopHandle;
     } & Readonly<{
         readonly height: string | number;