@dazhicheng/ui 1.6.27 → 1.6.29

package/dist/hooks/useScreenshotOss.js

@@ -13,73 +13,82 @@ import "../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js
 import "../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
 import "../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
 import "lodash-es";
-import { useElementScreenshot as y } from "../packages/hooks/src/useElementScreenshot.js";
+import { useElementScreenshot as b } from "../packages/hooks/src/useElementScreenshot.js";
 import "vue-router";
-import { GlobalConfig as g } from "./useSetup.js";
-function O(r = "png") {
-  const e = r === "jpeg" ? "jpg" : "png";
+import { GlobalConfig as m } from "./useSetup.js";
+import { getPostSignatureForObsUploadHuaweiOss as g } from "../api/oss.js";
+function T(t = "png") {
+  const e = t === "jpeg" ? "jpg" : "png";
   return `screenshot-${Date.now()}.${e}`;
 }
-function h(r, e) {
-  return new File([r], e, { type: r.type || "image/png" });
+function $(t, e) {
+  return new File([t], e, { type: t.type || "image/png" });
 }
-function d(r) {
-  return new Promise((e, s) => {
+function d(t) {
+  return new Promise((e, l) => {
     const o = new FileReader();
-    o.onload = () => e(o.result), o.onerror = () => s(o.error ?? new Error("Blob 转 DataURL 失败")), o.readAsDataURL(r);
+    o.onload = () => e(o.result), o.onerror = () => l(o.error ?? new Error("Blob 转 DataURL 失败")), o.readAsDataURL(t);
   });
 }
-async function x(r, e, s) {
-  const n = `${s || e.dir || "notice"}/${Date.now()}_${r.name}`, t = new FormData();
-  t.append("key", n), t.append("policy", e.policy), t.append("x-oss-signature-version", e.version), t.append("x-oss-signature", e.signature), t.append("x-oss-credential", e.x_oss_credential), t.append("x-oss-date", e.x_oss_date), t.append("x-oss-security-token", e.security_token), e.callback && t.append("callback", e.callback), t.append("success_action_status", "200"), t.append("file", r);
-  const a = await fetch(e.host, { method: "POST", body: t });
-  if (!a.ok && a.status !== 203)
-    throw new Error(`OSS 上传失败: ${a.status}`);
-  return n;
+async function _(t, e, l) {
+  const c = (l || e.dir || "notice").replace(/\/+$/, ""), a = c ? `${c}/${Date.now()}_${t.name}` : `${Date.now()}_${t.name}`, r = new FormData();
+  r.append("key", a), r.append("policy", e.policy), r.append("x-oss-signature-version", e.version), r.append("x-oss-signature", e.signature), r.append("x-oss-credential", e.x_oss_credential), r.append("x-oss-date", e.x_oss_date), r.append("x-oss-security-token", e.security_token), e.callback && r.append("callback", e.callback), r.append("success_action_status", "200"), r.append("file", t);
+  const n = await fetch(e.host, { method: "POST", body: r });
+  if (!n.ok && n.status !== 203 && n.status !== 200)
+    throw new Error(`OSS 上传失败: ${n.status}`);
+  return a;
 }
-function k(r) {
-  const e = r ?? g.uploadOssApi;
-  if (!e)
-    throw new Error("未配置 uploadOssApi，请先通过 setup({ uploadOssApi }) 或在 options 中传入 uploadOssApi");
-  return e;
+async function h(t, e, l) {
+  const c = (l || e.dir || "notice").replace(/\/+$/, ""), a = c ? `${c}/${Date.now()}_${t.name}` : `${Date.now()}_${t.name}`, r = new FormData();
+  r.append("key", a), r.append("policy", e.policy), r.append("AccessKeyId", e.accessKeyId), r.append("signature", e.signature), e.security_token && r.append("x-obs-security-token", e.security_token), e.callbackUrl && r.append("callbackUrl", e.callbackUrl), e.callbackBody && r.append("callbackBody", e.callbackBody), e.callbackBodyType && r.append("callbackBodyType", e.callbackBodyType), e.callback && r.append("callback", e.callback), r.append("success_action_status", "200"), r.append("file", t);
+  const n = await fetch(e.host, { method: "POST", body: r });
+  if (!n.ok && n.status !== 204 && n.status !== 200)
+    throw new Error(`OBS 上传失败: ${n.status}`);
+  return a;
 }
-async function p(r, e) {
-  const s = k(e == null ? void 0 : e.uploadOssApi), o = (e == null ? void 0 : e.format) ?? "png", n = (e == null ? void 0 : e.fileName) ?? O(o), t = h(r, n), a = await s(t), c = await x(t, a, e == null ? void 0 : e.ossDir);
-  return { blob: r, file: t, ossKey: c };
+async function O(t, e, l, o) {
+  return (o ?? m.ossType ?? "huawei") === "aliyun" ? _(t, e, l) : h(t, e, l);
 }
-function G() {
-  const r = y();
-  async function e(n, t) {
-    const a = await r.captureToBlob(n, t);
-    return p(a, t);
+function B(t) {
+  return t ?? m.uploadOssApi ?? g;
+}
+async function i(t, e) {
+  const l = B(e == null ? void 0 : e.uploadOssApi), o = (e == null ? void 0 : e.format) ?? "png", c = (e == null ? void 0 : e.fileName) ?? T(o), a = $(t, c), r = await l(a), n = await O(a, r, e == null ? void 0 : e.ossDir, e == null ? void 0 : e.ossType);
+  return { blob: t, file: a, ossKey: n };
+}
+function J() {
+  const t = b();
+  async function e(c, a) {
+    const r = await t.captureToBlob(c, a);
+    return i(r, a);
   }
-  async function s(n, t) {
-    const a = await r.captureToBlob(n, t), [c, i] = await Promise.all([d(a), p(a, t)]);
-    return { ...i, dataUrl: c };
+  async function l(c, a) {
+    const r = await t.captureToBlob(c, a), [n, p] = await Promise.all([d(r), i(r, a)]);
+    return { ...p, dataUrl: n };
   }
-  async function o(n, t) {
-    const { ossDir: a, fileName: c, uploadOssApi: i, output: m, ...f } = t, u = await r.captureComponent(n, {
+  async function o(c, a) {
+    const { ossDir: r, fileName: n, uploadOssApi: p, output: y, ...f } = a, s = await t.captureComponent(c, {
       ...f,
       output: "blob"
-    }), b = {
-      format: t.format,
-      quality: t.quality,
-      ossDir: a,
-      fileName: c,
-      uploadOssApi: i
-    }, l = await p(u, b);
-    if (m === "blob")
-      return l;
-    const w = await d(u);
-    return { ...l, dataUrl: w };
+    }), w = {
+      format: a.format,
+      quality: a.quality,
+      ossDir: r,
+      fileName: n,
+      uploadOssApi: p
+    }, u = await i(s, w);
+    if (y === "blob")
+      return u;
+    const k = await d(s);
+    return { ...u, dataUrl: k };
   }
   return {
     captureToBlob: e,
-    captureToDataUrl: s,
+    captureToDataUrl: l,
     captureComponent: o,
-    isCapturing: r.isCapturing
+    isCapturing: t.isCapturing
   };
 }
 export {
-  G as useScreenshotOss
+  J as useScreenshotOss
 };

package/dist/hooks/useSetup.js

@@ -1,8 +1,10 @@
 import t from "xe-utils";
-const i = {
+import { getPostSignatureForObsUploadHuaweiOss as i, getFileUrlOss as s } from "../api/oss.js";
+const a = {
   userId: void 0,
-  uploadOssApi: void 0,
-  uploadOssViewApi: void 0,
+  ossType: "huawei",
+  uploadOssApi: i,
+  uploadOssViewApi: s,
   showMask: !0,
   confirmContent: "确定要关闭吗？",
   table: {
@@ -10,31 +12,32 @@ const i = {
     setColumnsApi: void 0,
     updateColumnsApi: void 0,
     isAreaCheckboxSelection: !1,
-    currentPageField: "pageIndex",
+    currentPageField: "currentPage",
     pageSizeField: "pageSize",
     totalField: "total",
-    dataField: "list",
+    dataField: "records",
     tableRowId: "id",
     emptyText: "暂无数据",
     noSearchText: "请先点击查询",
     keyboardConfig: {
       isClip: !1
     },
-    useHttpCache: !1,
+    useHttpCache: !0,
     mouseConfig: {
       selected: !1
     },
+    isReloadResetToFirstPage: !1,
     pagerConfig: {
-      pageSize: 300,
-      pageSizes: [300, 500, 1e3, 2e3]
+      currentPage: 1,
+      pageSize: 20,
+      pageSizes: [10, 20, 50, 80, 100, 300]
     },
     showSetting: !0,
     showRefresh: !0,
     showExport: !1,
     defaultDisplayFields: [],
-    isReloadResetToFirstPage: !0,
     stripe: !0,
-    border: "outer",
+    border: "none",
     size: "mini",
     columnsKey: ""
   },
@@ -49,8 +52,8 @@ const i = {
     isSelectFirstOption: !1,
     renderType: "table"
   }
-}, s = (e) => t.merge(i, e ?? {});
+}, r = (e) => t.merge(a, e ?? {});
 export {
-  i as GlobalConfig,
-  s as setup
+  a as GlobalConfig,
+  r as setup
 };

package/dist/index.d.ts

@@ -17,6 +17,7 @@ export * from './components/tt-image';
 export * from './components/tt-loading';
 export * from './components/tt-table';
 export * from './components/tt-upload';
+export * from './api/oss';
 export * from './components/tt-nav-anchor';
 export * from './components/tt-api-component';
 export * from './components/tt-log';

package/dist/index.js

@@ -9,16 +9,16 @@ import { TtImage as T } from "./components/tt-image/index.js";
 import { RenderDrawer as n } from "./components/tt-drawer/index.js";
 import { RenderModal as c } from "./components/tt-modal/index.js";
 import { TtModal as so } from "./components/tt-modal/index.js";
-import { TtSelect as M } from "./components/tt-select/index.js";
-import { TtText as b } from "./components/tt-text/index.js";
-import { TtUpload as w } from "./components/tt-upload/index.js";
-import { TtNavAnchor as R } from "./components/tt-nav-anchor/index.js";
-import { TtApiComponent as h } from "./components/tt-api-component/index.js";
+import { TtSelect as g } from "./components/tt-select/index.js";
+import { TtText as M } from "./components/tt-text/index.js";
+import { TtUpload as b } from "./components/tt-upload/index.js";
+import { TtNavAnchor as w } from "./components/tt-nav-anchor/index.js";
+import { TtApiComponent as O } from "./components/tt-api-component/index.js";
 import * as e from "./directives/index.js";
-import { setup as g } from "./hooks/useSetup.js";
-import { TtLog as A } from "./components/tt-log/index.js";
-import { TtPanelSelect as P } from "./components/tt-panel-select/index.js";
-import { TtRadioGroup as S } from "./components/tt-radio-group/index.js";
+import { setup as P } from "./hooks/useSetup.js";
+import { TtLog as R } from "./components/tt-log/index.js";
+import { TtPanelSelect as S } from "./components/tt-panel-select/index.js";
+import { TtRadioGroup as h } from "./components/tt-radio-group/index.js";
 import { setXHR as lo } from "./utils/xhr.js";
 /* empty css                     */
 /* empty css                             */
@@ -27,62 +27,63 @@ import { setXHR as lo } from "./utils/xhr.js";
 /* empty css                                */
 import { default as xo } from "./components/tt-area/TtArea.vue.js";
 import { useModalForm as no } from "./components/tt-modal-form/useModalForm.js";
-import { TtLoading as Mo } from "./components/tt-loading/index.js";
-import { TtTable as wo, TtTableAction as Ro, TtTableButton as ho } from "./components/tt-table/index.js";
+import { TtLoading as go } from "./components/tt-loading/index.js";
+import { TtTable as bo, TtTableAction as wo, TtTableButton as Oo } from "./components/tt-table/index.js";
+import { getFileUrlOss as Ro, getPostSignatureForObsUploadHuaweiOss as So, getPostSignatureForOssUploadOss as ho } from "./api/oss.js";
 import { useFormSchemasLink as Ao } from "./hooks/useFormSchemasLink.js";
-import { useDataPermissionOptions as So } from "./hooks/useDataPermissionOptions.js";
-import { useBasicDataOptions as Do } from "./hooks/useBasicDataOptions.js";
-import { usePanelSelectSchemas as Fo } from "./hooks/usePanelSelectSchemas.js";
-import { CODES as Lo, GROUP_BY as Eo } from "./hooks/basicDataCodes.js";
-import { useFormat as Uo } from "./hooks/useFormat.js";
-import { useLoading as zo } from "./hooks/useLoading.js";
-import { useScreenshotOss as Go } from "./hooks/useScreenshotOss.js";
-import { createUppercaseInputProps as Vo, toUppercaseInputValue as _o, uppercaseInputProps as $o } from "./utils/uppercaseInput.js";
-import { setupDrawer as C } from "./components/tt-drawer/src/index.js";
-import { useShowDrawer as yo } from "./components/tt-drawer/src/index.js";
-import { setupModal as D } from "./components/tt-modal/src/index.js";
-import { useShowModal as Xo } from "./components/tt-modal/src/index.js";
-import { default as Zo } from "./directives/disabled-tip/index.js";
-import { default as Jo } from "./directives/auto-tip/index.js";
-import { showTtDrawer as Qo, useDrawerRender as Wo } from "./components/tt-drawer/src/hooks/useDrawerRender.js";
-import { useDrawerResizable as rr } from "./components/tt-drawer/src/hooks/useResizable.js";
-import { showTtModal as tr, useModalRender as mr } from "./components/tt-modal/src/hooks/useModalRender.js";
-import { closeAllTtModal as ar, closeTtModal as fr, openTtModal as sr, ttModal as dr } from "./components/tt-modal/src/utils/modal-service.js";
-import { default as lr } from "./directives/dialog-resize/index.js";
+import { useDataPermissionOptions as Do } from "./hooks/useDataPermissionOptions.js";
+import { useBasicDataOptions as Uo } from "./hooks/useBasicDataOptions.js";
+import { usePanelSelectSchemas as Eo } from "./hooks/usePanelSelectSchemas.js";
+import { CODES as vo, GROUP_BY as zo } from "./hooks/basicDataCodes.js";
+import { useFormat as Go } from "./hooks/useFormat.js";
+import { useLoading as Ho } from "./hooks/useLoading.js";
+import { useScreenshotOss as _o } from "./hooks/useScreenshotOss.js";
+import { createUppercaseInputProps as jo, toUppercaseInputValue as yo, uppercaseInputProps as Xo } from "./utils/uppercaseInput.js";
+import { setupDrawer as F } from "./components/tt-drawer/src/index.js";
+import { useShowDrawer as Zo } from "./components/tt-drawer/src/index.js";
+import { setupModal as A } from "./components/tt-modal/src/index.js";
+import { useShowModal as Jo } from "./components/tt-modal/src/index.js";
+import { default as Qo } from "./directives/disabled-tip/index.js";
+import { default as or } from "./directives/auto-tip/index.js";
+import { showTtDrawer as er, useDrawerRender as tr } from "./components/tt-drawer/src/hooks/useDrawerRender.js";
+import { useDrawerResizable as pr } from "./components/tt-drawer/src/hooks/useResizable.js";
+import { showTtModal as fr, useModalRender as sr } from "./components/tt-modal/src/hooks/useModalRender.js";
+import { closeAllTtModal as ir, closeTtModal as lr, openTtModal as ur, ttModal as xr } from "./components/tt-modal/src/utils/modal-service.js";
+import { default as nr } from "./directives/dialog-resize/index.js";
 import * as ro from "zod";
-import { useGroupForm as xr } from "./components/tt-form/src/group-form/useGroupForm.js";
-import { COMPONENT_MAP as nr } from "./components/tt-form/src/config.js";
-import { useForm as Mr } from "./components/tt-form/src/useForm.js";
-import { TtImageViewer as wr } from "./components/tt-image/src/components/ImageViewer.js";
+import { useGroupForm as gr } from "./components/tt-form/src/group-form/useGroupForm.js";
+import { COMPONENT_MAP as br } from "./components/tt-form/src/config.js";
+import { useForm as Or } from "./components/tt-form/src/useForm.js";
+import { TtImageViewer as Rr } from "./components/tt-image/src/components/ImageViewer.js";
 import { vTtLoading as hr } from "./components/tt-loading/src/directive.js";
 import { Loading as Ar } from "./components/tt-loading/src/service.js";
-import { useTableContext as Sr, useTableFormContext as Cr } from "./components/tt-table/src/hooks/useTableContext.js";
-import { useTableFormRender as Ir, useTableRender as Fr } from "./components/tt-table/src/hooks/useTableRender.js";
-import { ttUploadProps as Lr } from "./components/tt-upload/src/typing.js";
-const I = [
+import { useTableContext as Dr, useTableFormContext as Ir } from "./components/tt-table/src/hooks/useTableContext.js";
+import { useTableFormRender as Lr, useTableRender as Er } from "./components/tt-table/src/hooks/useTableRender.js";
+import { ttUploadProps as vr } from "./components/tt-upload/src/typing.js";
+const C = [
   p,
   n,
   c,
   l,
-  M,
+  g,
   f,
-  b,
+  M,
   a,
   i,
   T,
+  b,
   w,
-  R,
   u,
   x,
-  h,
-  A,
-  P,
-  S
-], F = (o) => {
-  I.forEach((r) => o.use(r)), Object.keys(e).forEach((r) => {
+  O,
+  R,
+  S,
+  h
+], D = (o) => {
+  C.forEach((r) => o.use(r)), Object.keys(e).forEach((r) => {
     const t = e[r], m = r.replace(/([A-Z])/g, "-$1").toLowerCase();
     o.directive(m, t);
-  }), C(o), D(o);
+  }), F(o), A(o);
 };
 function eo(o) {
   s(o == null ? void 0 : o.components), d(o == null ? void 0 : o.defineRules, o == null ? void 0 : o.modelPropNameMap);
@@ -92,83 +93,86 @@ const to = {
    * 安装组件
    * @param app Vue 应用实例
    */
-  install: F,
+  install: D,
   /**
    * 全局参数设置
    * @param options 全局参数
    * @returns 合并后的全局参数
    */
-  setup: g
+  setup: P
 };
 export {
-  Lo as CODES,
-  nr as COMPONENT_MAP,
-  Eo as GROUP_BY,
+  vo as CODES,
+  br as COMPONENT_MAP,
+  zo as GROUP_BY,
   Ar as Loading,
   n as RenderDrawer,
   c as RenderModal,
   ao as TtAddButton,
   u as TtAddIcon,
-  h as TtApiComponent,
+  O as TtApiComponent,
   xo as TtArea,
   p as TtButton,
   a as TtCheckbox,
   f as TtEmpty,
   l as TtIcon,
   T as TtImage,
-  wr as TtImageViewer,
-  Mo as TtLoading,
-  A as TtLog,
+  Rr as TtImageViewer,
+  go as TtLoading,
+  R as TtLog,
   so as TtModal,
-  R as TtNavAnchor,
-  P as TtPanelSelect,
-  S as TtRadioGroup,
-  M as TtSelect,
+  w as TtNavAnchor,
+  S as TtPanelSelect,
+  h as TtRadioGroup,
+  g as TtSelect,
   x as TtSubIcon,
-  wo as TtTable,
-  Ro as TtTableAction,
-  ho as TtTableButton,
-  b as TtText,
-  w as TtUpload,
+  bo as TtTable,
+  wo as TtTableAction,
+  Oo as TtTableButton,
+  M as TtText,
+  b as TtUpload,
   s as addComponent,
-  Jo as autoTip,
-  ar as closeAllTtModal,
-  fr as closeTtModal,
-  Vo as createUppercaseInputProps,
+  or as autoTip,
+  ir as closeAllTtModal,
+  lr as closeTtModal,
+  jo as createUppercaseInputProps,
   to as default,
-  lr as dialogResize,
-  Zo as disabledTip,
+  nr as dialogResize,
+  Qo as disabledTip,
   eo as formAdapter,
-  sr as openTtModal,
+  Ro as getFileUrlOss,
+  So as getPostSignatureForObsUploadHuaweiOss,
+  ho as getPostSignatureForOssUploadOss,
+  ur as openTtModal,
   d as setConfig,
   lo as setXHR,
-  C as setupDrawer,
-  D as setupModal,
-  Qo as showTtDrawer,
-  tr as showTtModal,
-  _o as toUppercaseInputValue,
-  dr as ttModal,
-  Lr as ttUploadProps,
-  $o as uppercaseInputProps,
-  Do as useBasicDataOptions,
-  So as useDataPermissionOptions,
-  Wo as useDrawerRender,
-  rr as useDrawerResizable,
-  Mr as useForm,
+  F as setupDrawer,
+  A as setupModal,
+  er as showTtDrawer,
+  fr as showTtModal,
+  yo as toUppercaseInputValue,
+  xr as ttModal,
+  vr as ttUploadProps,
+  Xo as uppercaseInputProps,
+  Uo as useBasicDataOptions,
+  Do as useDataPermissionOptions,
+  tr as useDrawerRender,
+  pr as useDrawerResizable,
+  Or as useForm,
   Ao as useFormSchemasLink,
-  Uo as useFormat,
-  xr as useGroupForm,
-  zo as useLoading,
+  Go as useFormat,
+  gr as useGroupForm,
+  Ho as useLoading,
   no as useModalForm,
-  mr as useModalRender,
-  Fo as usePanelSelectSchemas,
-  Go as useScreenshotOss,
-  yo as useShowDrawer,
-  Xo as useShowModal,
-  Sr as useTableContext,
-  Cr as useTableFormContext,
-  Ir as useTableFormRender,
-  Fr as useTableRender,
+  sr as useModalRender,
+  Eo as usePanelSelectSchemas,
+  _o as useScreenshotOss,
+  Zo as useShowDrawer,
+  Jo as useShowModal,
+  Dr as useTableContext,
+  Ir as useTableFormContext,
+  Lr as useTableFormRender,
+  Er as useTableRender,
   hr as vTtLoading,
   ro as z
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.27",
+  "version": "1.6.29",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",