@ditari/bsui 1.1.42 → 1.1.44

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

@@ -58,241 +58,46 @@ export const useTable = () => {
 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: "dd",
+      customRender: (text, record, index) => {
+        return "dd";
+      },
+      customCell: (_, index) => {
+        if (index === 2) {
+          return { rowSpan: 2 };
+        }
+        // These two are merged into above cell
+        if (index === 3) {
+          return { rowSpan: 0 };
+        }
+        if (index === 4) {
+          return { colSpan: 0 };
+        }
       }
     },
     {
-      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: "job",
+      customCell: (_, index) => {
+        if (index === 2) {
+          return { rowSpan: 2 };
+        }
+        // These two are merged into above cell
+        if (index === 3) {
+          return { rowSpan: 0 };
+        }
+        if (index === 4) {
+          return { colSpan: 0 };
+        }
+      }
     },
     {
-      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)
-        // ]);
-      }
+      dataIndex: "name",
+      title: "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)
-        // ]);
-      }
+      dataIndex: "job",
+      title: "job"
     }
   ];
   return {

package/package.json

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

package/src/layout/List.vue

@@ -47,7 +47,7 @@ function useReload() {
     stopHandleWatch = useWatch();
     // 卸载未缓存的组件
     onUnmounted(() => {
-      stopHandleWatch();
+      stopHandleWatch && stopHandleWatch();
     });
   } else {
     // 激活缓存页面
@@ -60,7 +60,7 @@ function useReload() {
     });
     // 离开缓存页面
     onDeactivated(() => {
-      stopHandleWatch();
+      stopHandleWatch && stopHandleWatch();
     });
   }
 }

package/src/layout/Show.vue

@@ -16,10 +16,13 @@ const props = withDefaults(
     close?: boolean;
     // 请求数据的时候开启加载效果
     loading?: boolean;
+    // 是否显示返回按钮
+    showBack?: boolean;
   }>(),
   {
     close: false,
-    loading: false
+    loading: false,
+    showBack: true
   }
 );
 
@@ -99,6 +102,7 @@ defineExpose({
       size="large"
     >
       <a-page-header
+        v-if="showBack"
         class="ditari-page-header"
         :class="{ active: y > 0 }"
         :ghost="false"

package/src/layout/style/index.scss

@@ -4,4 +4,32 @@
 @import "./main";
 @import "./navtab";
 @import "./show";
-@import "./fuckmain";
+@import "./fuckmain";
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.1s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.main-enter-active {
+  transition: 0.2s;
+}
+
+.main-leave-active {
+  transition: 0.15s;
+}
+
+.main-enter-from {
+  opacity: 0;
+  margin-left: -20px;
+}
+
+.main-leave-to {
+  opacity: 0;
+  margin-left: 20px;
+}

package/src/layout/style/main.scss

@@ -23,33 +23,7 @@
     margin-top: 84px;
   }
 }
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.1s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
-
-.main-enter-active {
-  transition: 0.2s;
-}
 
-.main-leave-active {
-  transition: 0.15s;
-}
-
-.main-enter-from {
-  opacity: 0;
-  margin-left: -20px;
-}
-
-.main-leave-to {
-  opacity: 0;
-  margin-left: 20px;
-}
 
 .ditari-layout-header {
   display: flex;

package/src/table/Table.tsx

@@ -145,7 +145,6 @@ const DXTable = defineComponent({
       const antTableBodyRef = ref<any>(null);
       // 计算高度
       const playHeight = (height: number) => {
-        console.log("okk");
         try {
           const tableEl = tableRef?.value?.$el;
           const headerHeight = useEleHeight(
@@ -293,23 +292,6 @@ const DXTable = defineComponent({
 
       const rowSelection = ref<any>(undefined);
 
-      // watchEffect(() => {
-      //   const { selection } = props.config;
-      //   localSelection = selection as any;
-      //   if (localSelection !== "N") {
-      //     rowSelection.value = {
-      //       selectedRowKeys,
-      //       onSelect,
-      //       onSelectAll,
-      //       fixed: true,
-      //       columnTitle: localSelection === "S" ? "选择" : null,
-      //       columnWidth: localSelection === "S" ? 60 : 40,
-      //       getCheckboxProps: getCheckboxProps
-      //     };
-      //   } else {
-      //     rowSelection.value = undefined;
-      //   }
-      // });
       watch(
         () => props.config.selection,
         (val) => {