@ditari/bsui 1.1.28 → 1.1.30

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/components/AppMain.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { UserOutlined } from "@ant-design/icons-vue";
-import { Main as DMainLayout } from "../../../src/components";
+import { FuckMain as FuckMain } from "../../../src/components";
 import { useMenuStore } from "../../../../store";
 
 const MenuList = [
@@ -39,7 +39,7 @@ const MenuList = [
   {
     title: "Form",
     url: "/form",
-    icon: "icon-a-icon-documentsattached",
+    icon: "icon-a-icon-documentsattached"
   }
 ];
 const store = useMenuStore();
@@ -55,7 +55,7 @@ export default {
 };
 </script>
 <template>
-  <DMainLayout>
+  <FuckMain>
     <template #logo>
       <div class="app-logo">dsfdsf</div>
     </template>
@@ -85,6 +85,6 @@ export default {
       </div>
     </template>
     <template #micro> </template>
-  </DMainLayout>
+  </FuckMain>
 </template>
 <style scoped></style>

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

@@ -268,19 +268,42 @@ export default {
 </script>
 <template>
   <d-list-layout>
-    <template #form>
-      <d-query-form :value="formState" :scheme="scheme" @query="onQuery">
-      </d-query-form>
-    </template>
+    <!--    <template #form>-->
+    <!--      <d-query-form :value="formState" :scheme="scheme" @query="onQuery">-->
+    <!--      </d-query-form>-->
+    <!--    </template>-->
     <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 - 200"
+      >
+        <template #action>
+          <a-button>ok</a-button>
+        </template>
+      </d-table>
+      <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="200"
       >
         <template #action>
           <a-button>ok</a-button>

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

@@ -2,57 +2,10 @@ import { useRequestList } from "../../../../../hooks";
 import { reactive, ref } from "vue";
 import { testService } from "../../api/list";
 
-export const useTableConfig = () => {
-  const columns = [
-    {
-      title: "Id",
-      dataIndex: "id",
-      width: 350
-    },
-    {
-      title: "Name",
-      dataIndex: "name",
-      width: 350
-    },
-    {
-      title: "avatar",
-      dataIndex: "avatar",
-      width: 350,
-      config: {
-        type: "dic",
-        name: "k_v",
-        style: {
-          D: "red",
-          S: "blue"
-        }
-      }
-    },
-    {
-      title: "Job",
-      dataIndex: "job",
-      width: 350,
-      config: {
-        type: "date",
-        formatter: "YYYY"
-      }
-    },
-    {
-      title: "操作",
-      width: 100,
-      fixed: "right",
-      slot: "action"
-    }
-  ];
-
-  return {
-    columns
-  };
-};
-
 export const useTable = () => {
   const queryParams = ref({ limit: 20, page: 1 });
   const selectedRowKeys = ref<any>([]);
-  const { columns } = useTableConfig();
+  const { columns } = _useColumns();
 
   const { data, loading, onPageChange, pagination, run, onQuery } =
     useRequestList(testService, {
@@ -65,7 +18,7 @@ export const useTable = () => {
   //表格选项
   const config = reactive({
     columns,
-    bordered: true,
+    // bordered: true,
     pagination,
     selection: "N",
     onPageChange,
@@ -100,3 +53,248 @@ export const useTable = () => {
     onQuery
   };
 };
+
+function _useColumns() {
+  const columns = [
+    {
+      title: "运输方式",
+      dataIndex: "plateNo",
+      width: 150,
+      tooltip: "true",
+      tooltipTheme: "light",
+      render: (h, params) => {
+        // const name = matchNameById('bsw_trafMode', params.row.trafMode).name
+        // return h('span', name)
+      }
+    },
+    {
+      title: "车牌号",
+      dataIndex: "plateNo",
+      width: 150,
+      align: "center"
+    },
+    {
+      title: "进出口标识",
+      dataIndex: "iEFlag",
+
+      width: 120,
+      render: (h: any, params: any) => {
+        //
+        // const rs = matchNameById("bsw_ie_flag", params.row.iEFlag);
+        // return h('span', rs.name)
+      }
+    },
+    {
+      title: "预录入编号",
+      dataIndex: "seqNo",
+
+      width: 220,
+      tooltip: "true",
+      tooltipTheme: "light"
+    },
+    {
+      title: "预申报单号",
+      dataIndex: "preDecNo",
+
+      width: 220,
+      tooltip: "true",
+      tooltipTheme: "light"
+    },
+    {
+      title: "申报单编号",
+      dataIndex: "declareId",
+
+      width: 220,
+      tooltip: "true",
+      tooltipTheme: "light"
+    },
+    {
+      title: "关区名称",
+      dataIndex: "lshg",
+
+      width: 100,
+      render: (h: any, params: any) => {
+        // const rs = matchNameById('ddl_cod_cus_customs', params.row.lshg)
+        // return h('span', rs.name)
+      }
+    },
+    {
+      title: "场所名称",
+      dataIndex: "frontiertrader",
+      width: 120,
+
+      tooltip: "true",
+      tooltipTheme: "light",
+      render: (h: any, params: any) => {
+        // const rs = matchNameById('ddl_cod_biz_areas', params.row.frontiertrader)
+        // return h('span', rs.name)
+      }
+    },
+
+    {
+      title: "商铺名称",
+      dataIndex: "storeName",
+      width: 150,
+
+      tooltip: true,
+      tooltipTheme: "light"
+    },
+
+    {
+      title: "申报人类别",
+      dataIndex: "declareType",
+
+      width: 120,
+      render: (h: any, params: any) => {
+        //
+        // const rs = matchNameById("bsw_dec_man_type", params.row.declareType);
+        // return h('span', rs.name)
+      }
+    },
+    {
+      title: "合作社/互助组名称",
+      dataIndex: "orgName",
+      width: 160,
+
+      tooltip: true,
+      tooltipTheme: "light"
+    },
+    {
+      title: "申报人姓名",
+      dataIndex: "declareName",
+
+      width: 200
+    },
+    {
+      title: "申报人身份证",
+      dataIndex: "ciphertextIdno",
+
+      width: 200,
+      render: (h: any, params: any) => {
+        // return h('span', tmCardCord(params.row.ciphertextIdno))
+      }
+    },
+    {
+      title: "业务模式",
+      dataIndex: "btrnbBizModecd",
+
+      width: 120,
+      render: (h: any, params: any) => {
+        // const rs = matchNameById('bsw_btrnbBizModecd', params.row.btrnbBizModecd)
+        // return h('span', rs.name)
+      }
+    },
+    {
+      title: "是否拼车",
+      dataIndex: "carPool",
+
+      width: 120,
+      render: (h: any, params: any) => {
+        // const rs = matchNameById('bsw_yes_no', params.row.carPool)
+        // return h('span', rs.name)
+      }
+    },
+
+    {
+      title: "商品名称",
+      dataIndex: "gNames",
+
+      width: 200,
+      tooltip: "true",
+      tooltipTheme: "light"
+    },
+    {
+      title: "货物总金额",
+      dataIndex: "sumAmt",
+
+      tooltip: "true",
+      tooltipTheme: "light",
+      width: 130
+    },
+    {
+      title: "货物总毛重",
+      dataIndex: "sumGrossWt",
+
+      tooltip: "true",
+      tooltipTheme: "light",
+      width: 130
+    },
+    {
+      title: "货物总净重",
+      dataIndex: "sumNetWt",
+
+      tooltip: "true",
+      tooltipTheme: "light",
+      width: 130
+    },
+    {
+      title: "申报时间",
+      dataIndex: "dclTime",
+
+      width: 200
+    },
+    {
+      title: "申报单类型",
+      dataIndex: "dclType",
+
+      width: 130,
+
+      render: (h: any, params: any) => {
+        // const rs = matchNameById("ddl_dcl_type", params.row.dclType);
+        // return h("span", rs.name);
+      }
+    },
+    {
+      title: "单证ID",
+      dataIndex: "id",
+
+      tooltip: "true",
+      tooltipTheme: "light",
+      width: 100
+    },
+    {
+      title: "申报失败描述",
+      dataIndex: "dclFailDesc",
+
+      width: 200,
+      tooltip: "true",
+      tooltipTheme: "light",
+      fixed: "right"
+    },
+    {
+      title: "申报状态",
+      dataIndex: "recordStatus",
+
+      width: 120,
+      fixed: "right",
+      render: (h: any, params: any) => {
+        // const rs = matchNameById("ddl_record_status", params.row.recordStatus);
+        // const color = matchColor(params.row.recordStatus);
+        // return h("div", [
+        //   h("span", { class: ["ivu-badge-status-dot", color.dotColor] }),
+        //   h("span", { class: [color.txtColor] }, rs.name)
+        // ]);
+      }
+    },
+
+    {
+      title: "状态",
+      dataIndex: "status",
+      width: 160,
+      tooltip: "true",
+      tooltipTheme: "light",
+      fixed: "right",
+      render: (h: any, params: any) => {
+        // const rs = matchNameById("bsw_status_0103", params.row.status);
+        // const color = matchColor(params.row.status);
+        // return h("div", [
+        //   h("span", { class: ["ivu-badge-status-dot", color.dotColor] }),
+        //   h("span", { class: [color.txtColor] }, rs.name)
+        // ]);
+      }
+    }
+  ];
+  return {
+    columns
+  };
+}