@ditari/bsui 1.1.28 → 1.1.29

package/example/node_modules/.vite/deps/_metadata.json

@@ -1,59 +1,59 @@
 {
-  "hash": "127dc0b3",
-  "browserHash": "ecbe7dde",
+  "hash": "ed01a902",
+  "browserHash": "6c59cd66",
   "optimized": {
     "@ant-design/icons-vue": {
       "src": "../../../../../../node_modules/.pnpm/@ant-design+icons-vue@6.1.0_vue@3.3.4/node_modules/@ant-design/icons-vue/es/index.js",
       "file": "@ant-design_icons-vue.js",
-      "fileHash": "7220585f",
+      "fileHash": "9584c5c4",
       "needsInterop": false
     },
     "@vueuse/core": {
       "src": "../../../../../../node_modules/.pnpm/@vueuse+core@9.13.0_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/@vueuse/core/index.mjs",
       "file": "@vueuse_core.js",
-      "fileHash": "68554331",
+      "fileHash": "1ff61211",
       "needsInterop": false
     },
     "ant-design-vue": {
       "src": "../../../../../../node_modules/.pnpm/ant-design-vue@3.2.20_vue@3.3.4/node_modules/ant-design-vue/es/index.js",
       "file": "ant-design-vue.js",
-      "fileHash": "07f9a6e1",
+      "fileHash": "e9e273ea",
+      "needsInterop": false
+    },
+    "axios": {
+      "src": "../../../../../../node_modules/.pnpm/axios@1.4.0/node_modules/axios/index.js",
+      "file": "axios.js",
+      "fileHash": "703a70b0",
       "needsInterop": false
     },
     "pinia": {
       "src": "../../../../../../node_modules/.pnpm/pinia@2.1.4_@vue+composition-api@1.7.1_typescript@4.9.5_vue@3.3.4/node_modules/pinia/dist/pinia.mjs",
       "file": "pinia.js",
-      "fileHash": "5b165f94",
+      "fileHash": "90342e48",
       "needsInterop": false
     },
     "pinia-plugin-persistedstate": {
       "src": "../../../../../../node_modules/.pnpm/pinia-plugin-persistedstate@3.1.0_pinia@2.1.4/node_modules/pinia-plugin-persistedstate/dist/index.mjs",
       "file": "pinia-plugin-persistedstate.js",
-      "fileHash": "7875307e",
+      "fileHash": "4c0ed159",
       "needsInterop": false
     },
     "vue": {
       "src": "../../../../../../node_modules/.pnpm/vue@3.3.4/node_modules/vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "b862c4cd",
-      "needsInterop": false
-    },
-    "vue-router": {
-      "src": "../../../../../../node_modules/.pnpm/vue-router@4.2.4_vue@3.3.4/node_modules/vue-router/dist/vue-router.mjs",
-      "file": "vue-router.js",
-      "fileHash": "8dd191e8",
-      "needsInterop": false
-    },
-    "axios": {
-      "src": "../../../../../../node_modules/.pnpm/axios@1.4.0/node_modules/axios/index.js",
-      "file": "axios.js",
-      "fileHash": "299d8ad7",
+      "fileHash": "a4178637",
       "needsInterop": false
     },
     "vue-request": {
       "src": "../../../../../../node_modules/.pnpm/vue-request@2.0.0-rc.4_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/vue-request/dist/index.es.js",
       "file": "vue-request.js",
-      "fileHash": "450a611a",
+      "fileHash": "b90ec3ba",
+      "needsInterop": false
+    },
+    "vue-router": {
+      "src": "../../../../../../node_modules/.pnpm/vue-router@4.2.4_vue@3.3.4/node_modules/vue-router/dist/vue-router.mjs",
+      "file": "vue-router.js",
+      "fileHash": "1c61adf5",
       "needsInterop": false
     }
   },
@@ -61,12 +61,15 @@
     "chunk-EKNPBJBG": {
       "file": "chunk-EKNPBJBG.js"
     },
+    "chunk-D36HXFYL": {
+      "file": "chunk-D36HXFYL.js"
+    },
+    "chunk-TDI2FIXO": {
+      "file": "chunk-TDI2FIXO.js"
+    },
     "chunk-EBDM3ESC": {
       "file": "chunk-EBDM3ESC.js"
     },
-    "chunk-SHNKM4NZ": {
-      "file": "chunk-SHNKM4NZ.js"
-    },
     "chunk-GK7Q6YQN": {
       "file": "chunk-GK7Q6YQN.js"
     },

package/example/node_modules/.vite/deps/{chunk-SHNKM4NZ.js → chunk-D36HXFYL.js}

@@ -1,6 +1,5 @@
 // ../../../node_modules/.pnpm/vue-demi@0.14.5_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/vue-demi/lib/index.mjs
 var isVue2 = false;
-var isVue3 = true;
 function set(target, key, val) {
   if (Array.isArray(target)) {
     target.length = Math.max(target.length, key);
@@ -20,8 +19,7 @@ function del(target, key) {
 
 export {
   isVue2,
-  isVue3,
   set,
   del
 };
-//# sourceMappingURL=chunk-SHNKM4NZ.js.map
+//# sourceMappingURL=chunk-D36HXFYL.js.map

package/example/node_modules/.vite/deps/chunk-D36HXFYL.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../node_modules/.pnpm/vue-demi@0.14.5_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/vue-demi/lib/index.mjs"],
+  "sourcesContent": ["import * as Vue from 'vue'\n\nvar isVue2 = false\nvar isVue3 = true\nvar Vue2 = undefined\n\nfunction install() {}\n\nexport function set(target, key, val) {\n  if (Array.isArray(target)) {\n    target.length = Math.max(target.length, key)\n    target.splice(key, 1, val)\n    return val\n  }\n  target[key] = val\n  return val\n}\n\nexport function del(target, key) {\n  if (Array.isArray(target)) {\n    target.splice(key, 1)\n    return\n  }\n  delete target[key]\n}\n\nexport * from 'vue'\nexport {\n  Vue,\n  Vue2,\n  isVue2,\n  isVue3,\n  install,\n}\n"],
+  "mappings": ";AAEA,IAAI,SAAS;AAMN,SAAS,IAAI,QAAQ,KAAK,KAAK;AACpC,MAAI,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,SAAS,KAAK,IAAI,OAAO,QAAQ,GAAG;AAC3C,WAAO,OAAO,KAAK,GAAG,GAAG;AACzB,WAAO;AAAA,EACT;AACA,SAAO,GAAG,IAAI;AACd,SAAO;AACT;AAEO,SAAS,IAAI,QAAQ,KAAK;AAC/B,MAAI,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,OAAO,KAAK,CAAC;AACpB;AAAA,EACF;AACA,SAAO,OAAO,GAAG;AACnB;",
+  "names": []
+}

package/example/node_modules/.vite/deps/chunk-TDI2FIXO.js

@@ -0,0 +1,19 @@
+// ../../../node_modules/.pnpm/vue-demi@0.14.6_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/vue-demi/lib/index.mjs
+var isVue2 = false;
+var isVue3 = true;
+function set(target, key, val) {
+  if (Array.isArray(target)) {
+    target.length = Math.max(target.length, key);
+    target.splice(key, 1, val);
+    return val;
+  }
+  target[key] = val;
+  return val;
+}
+
+export {
+  isVue2,
+  isVue3,
+  set
+};
+//# sourceMappingURL=chunk-TDI2FIXO.js.map

package/example/node_modules/.vite/deps/{chunk-SHNKM4NZ.js.map → chunk-TDI2FIXO.js.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../node_modules/.pnpm/vue-demi@0.14.5_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/vue-demi/lib/index.mjs"],
+  "sources": ["../../../../../../node_modules/.pnpm/vue-demi@0.14.6_@vue+composition-api@1.7.1_vue@3.3.4/node_modules/vue-demi/lib/index.mjs"],
   "sourcesContent": ["import * as Vue from 'vue'\n\nvar isVue2 = false\nvar isVue3 = true\nvar Vue2 = undefined\n\nfunction install() {}\n\nexport function set(target, key, val) {\n  if (Array.isArray(target)) {\n    target.length = Math.max(target.length, key)\n    target.splice(key, 1, val)\n    return val\n  }\n  target[key] = val\n  return val\n}\n\nexport function del(target, key) {\n  if (Array.isArray(target)) {\n    target.splice(key, 1)\n    return\n  }\n  delete target[key]\n}\n\nexport * from 'vue'\nexport {\n  Vue,\n  Vue2,\n  isVue2,\n  isVue3,\n  install,\n}\n"],
-  "mappings": ";AAEA,IAAI,SAAS;AACb,IAAI,SAAS;AAKN,SAAS,IAAI,QAAQ,KAAK,KAAK;AACpC,MAAI,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,SAAS,KAAK,IAAI,OAAO,QAAQ,GAAG;AAC3C,WAAO,OAAO,KAAK,GAAG,GAAG;AACzB,WAAO;AAAA,EACT;AACA,SAAO,GAAG,IAAI;AACd,SAAO;AACT;AAEO,SAAS,IAAI,QAAQ,KAAK;AAC/B,MAAI,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,OAAO,KAAK,CAAC;AACpB;AAAA,EACF;AACA,SAAO,OAAO,GAAG;AACnB;",
+  "mappings": ";AAEA,IAAI,SAAS;AACb,IAAI,SAAS;AAKN,SAAS,IAAI,QAAQ,KAAK,KAAK;AACpC,MAAI,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,SAAS,KAAK,IAAI,OAAO,QAAQ,GAAG;AAC3C,WAAO,OAAO,KAAK,GAAG,GAAG;AACzB,WAAO;AAAA,EACT;AACA,SAAO,GAAG,IAAI;AACd,SAAO;AACT;",
   "names": []
 }

package/example/node_modules/.vite/deps/pinia.js

@@ -1,11 +1,11 @@
-import {
-  setupDevtoolsPlugin
-} from "./chunk-EBDM3ESC.js";
 import {
   del,
   isVue2,
   set
-} from "./chunk-SHNKM4NZ.js";
+} from "./chunk-D36HXFYL.js";
+import {
+  setupDevtoolsPlugin
+} from "./chunk-EBDM3ESC.js";
 import {
   computed,
   effectScope,

package/example/node_modules/.vite/deps/vue-request.js

@@ -1,4 +1,4 @@
-import "./chunk-SHNKM4NZ.js";
+import "./chunk-TDI2FIXO.js";
 import {
   computed,
   inject,

package/example/src/App.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts"></script>
 <template>
-  <router-link to="/form/query-demo"> 跳转 </router-link>
   <router-view v-slot="{ Component }">
     <keep-alive>
       <component :is="Component" />

package/example/src/api/user.ts

@@ -0,0 +1,13 @@
+import http from "../../utils/http";
+
+export const getImgCode = () => {
+  return http.get("getVerifyCode");
+};
+
+export const doLogin = (params: any) => {
+  // const formData = new FormData();
+  // formData.append("username", params.username);
+  // formData.append("password", params.password);
+  // formData.append("verifyCode", params.verifyCode);
+  return http.post("login", params);
+};

package/example/src/views/Login.vue

@@ -2,19 +2,59 @@
 /**
  * 登录
  */
+import { ref } from "vue";
+import { getImgCode, doLogin } from "../api/user";
+const formState = ref({
+  username: "",
+  password: "",
+  verifyCode: "",
+  verifyCodeKey: ""
+});
+const src = ref("");
+const onCode = () => {
+  getImgCode().then((res) => {
+    src.value = res.verifyCode;
+    formState.value.verifyCodeKey = res.verifyCodeKey
+  });
+};
+
+const onLogin = () => {
+  doLogin(formState.value).then((res) => {
+    console.log(res);
+  });
+};
+onCode();
 </script>
 <template>
   <div class="login-main">
     <div class="login-box">
       <a-form>
         <a-form-item>
-          <a-input placeholder="请输入账号" />
+          <a-input
+            v-model:value="formState.username"
+            placeholder="请输入账号"
+          />
         </a-form-item>
         <a-form-item>
-          <a-input type="password" placeholder="请输入密码" />
+          <a-input
+            v-model:value="formState.password"
+            type="password"
+            placeholder="请输入密码"
+          />
         </a-form-item>
         <a-form-item>
-          <a-button type="primary" block>登录</a-button>
+          <a-input
+            v-model:value="formState.verifyCode"
+            placeholder="请输入密码"
+          />
+          <img
+            style="width: 120px; height: 40px"
+            :src="'data:image/jpg;base64,' + src"
+            @click="onCode"
+          />
+        </a-form-item>
+        <a-form-item>
+          <a-button type="primary" block @click="onLogin">登录</a-button>
         </a-form-item>
       </a-form>
     </div>

package/example/src/views/table/List.vue

@@ -275,17 +275,23 @@ export default {
     <template #table="{ height }">
       <d-table
         v-model:keys="selectedRowKeys"
+        @change="
+          () => {
+            console.log('change');
+          }
+        "
         row-key="id"
         :loading="loading"
         :expanded-row-keys="['1', '2']"
         :data="data"
         :config="config"
-        :height="height"
+        :height="height - 200"
       >
         <template #action>
           <a-button>ok</a-button>
         </template>
       </d-table>
+      <div style="height: 200px; background-color: red"></div>
     </template>
     <!--    <TestModal v-model:visible="visible" />-->
   </d-list-layout>

package/example/src/views/table/hooks.ts

@@ -7,6 +7,7 @@ export const useTableConfig = () => {
     {
       title: "Id",
       dataIndex: "id",
+      sorter: true,
       width: 350
     },
     {

package/example/utils/http.ts

@@ -0,0 +1,107 @@
+import axios from "axios";
+import { message as Message, Modal } from "ant-design-vue";
+import type {
+  AxiosInstance,
+  InternalAxiosRequestConfig,
+  AxiosResponse
+} from "axios";
+
+const cancelSource = axios.CancelToken.source();
+const http: AxiosInstance = axios.create({
+  baseURL: "http://172.16.10.34:1243/",
+  timeout: 1000 * 10 * 60,
+  cancelToken: cancelSource.token,
+  withCredentials: true
+});
+
+// 因为现在的后台接口状态码真是TMD没统一
+const SUCCESS_CODE = ["200", "0"];
+// 登录失效状态码
+const EXPIRED_STATUS_CODE = ["401", "403"];
+// 超额状态码
+const OVER_AMOUNT_CODE = ["1056"];
+const BLACK_URL = ["/login"];
+
+http.interceptors.request.use((config: InternalAxiosRequestConfig) => {
+  if (!BLACK_URL.includes(config.url as any)) {
+    // 没有包含login的url 才添加token
+    // config.headers["Authorization"] = getToken;
+  }
+  return config;
+});
+
+http.interceptors.response.use(
+  async ({ data }: AxiosResponse) => {
+    const { code, data: content, message } = data;
+    const successStatus = SUCCESS_CODE.includes(code);
+
+    // 状态码在SUCCESS_CODE 里面表示成功
+    if (successStatus) {
+      // 返回响应内容
+      return content;
+    }
+
+    switch (code) {
+      case EXPIRED_STATUS_CODE[0]:
+      case EXPIRED_STATUS_CODE[1]:
+        handleExpiredToken();
+        break;
+      case OVER_AMOUNT_CODE[0]:
+        handleOverAmount(message);
+        break;
+      default:
+        handleDefaultError(message);
+        break;
+    }
+    return Promise.reject(data);
+  },
+  (error) => {
+    // 网络超时异常处理
+    if (
+      error.code === "ECONNABORTED" ||
+      error.message === "Network Error" ||
+      error.message.includes("timeout")
+    ) {
+      handleTimeoutError();
+    }
+    return Promise.reject(error);
+  }
+);
+
+function handleExpiredToken() {
+  cancelSource.cancel("token失效，取消后续请求");
+  sessionStorage.clear();
+  Message.warn({ content: "登录失效，请重新登录", duration: 5 });
+  setTimeout(() => {
+    location.href = (import.meta.env.VITE_APP_BASE_URL || "") + "/login";
+  }, 2000);
+}
+
+function handleOverAmount(message: string) {
+  Modal.confirm({
+    title: "超额提示",
+    content: message,
+    centered: true,
+    okText: "明白",
+    cancelText: "关闭",
+    onCancel() {
+      Modal.destroyAll();
+    }
+  });
+}
+
+function handleDefaultError(message: string) {
+  Message.warn({
+    content: message || "未知错误，请联系后台开发人员！！！",
+    duration: 6
+  });
+}
+
+function handleTimeoutError() {
+  Message.error({
+    content: "请求超时，请稍后重试",
+    duration: 6
+  });
+}
+
+export default http;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.1.28",
+  "version": "1.1.29",
   "description": "",
   "keywords": [],
   "author": "",

package/src/table/Table.tsx

@@ -71,11 +71,13 @@ const basePageClassName = `${prefixName}-pagination`;
  */
 const DXTable = defineComponent({
   name: "DTable",
+  inheritAttrs: false,
   props: tableProps(),
   // emits: {  "update:keys": (keys: []) => void }
   // TODO 需要做调整
   emits: ["update:keys"],
-  setup: function (props, { emit, slots }) {
+  setup: function (props, { emit, slots, attrs }) {
+    console.log(attrs);
     //分页默认配置
     const paginationConfig = reactive({
       defaultPageSize: 20,
@@ -396,11 +398,12 @@ const DXTable = defineComponent({
     };
 
     return () => (
-      <div ref={tableRootRef} style={{ height: "100%" }}>
+      <div ref={tableRootRef}>
         <Table
           ref={tableRef}
           row-key={props.rowKey}
           bordered={props.config.bordered}
+          {...attrs}
           columns={columns.value}
           dataSource={dataSource.value}
           loading={props.loading}