fix: CrudTable支持传入columns @0.9.2-4

BoBoooooo · Mar 22, 2021 · 347ea93 · 347ea93
1 parent 805bbff
commit 347ea93
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-pro-crud",
-  "version": "0.9.2-3",
+  "version": "0.9.2-4",
   "author": "BoBo<[email protected]>",
   "main": "lib/ProCrud.umd.min.js",
   "files": [

diff --git a/src/component/crud-table/src/CrudTable.vue b/src/component/crud-table/src/CrudTable.vue
@@ -92,7 +92,7 @@ import {
   columns, DataSource, DML, Params,
 } from '@/types/common';
 import VueCompositionApi, {
-  reactive, computed, ref, defineComponent, Ref, watch,
+  reactive, computed, ref, defineComponent, Ref, watch, PropType,
 } from '@vue/composition-api';
 import GenerateFormDialog from './GenerateFormDialog.vue';
 import ProTable from '../../pro-table';
@@ -249,6 +249,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    columns: {
+      type: Object as PropType<columns>,
+      default: null,
+    },
   },
   emits: ['form-btn-on-click', 'form-change', 'selection-change'],
   setup(props: CrudTableProps, {
@@ -314,26 +318,35 @@ export default defineComponent({
     const tableReload = () => {
       proTableRef.value.tableReload();
     };
-
+    const { columns: propsColumns } = props;
+    console.log(propsColumns);
+    // 如果外侧传入了columns则不发起请求
+    if (propsColumns) {
+      tableConfig.columns = propsColumns.columns;
+      tableConfig.name = propsColumns.name;
+      tableConfig.position = propsColumns.position;
+    } else {
     // 初始化表格json
-    const promise = $PROCRUD.getTableDetail(props.tableDesignerName ? props.tableDesignerName : props.tableName);
-    // 加载表格结构
-    promise.then((res) => {
-      const _tableConfig = JSON.parse(res.data.formJson);
-      // eslint-disable-next-line no-shadow
-      const { columns, name, position } = _tableConfig;
-      tableConfig.columns = columns;
-      tableConfig.name = name;
-      tableConfig.position = position;
-      // 如果显示指明了操作列列宽
-      if (props.actionColumnWidth) {
-        const actionColumn = tableConfig.columns.find(_ => _.slotName === 'actionColumn');
-        if (actionColumn) {
-          actionColumn.width = props.actionColumnWidth;
-          actionColumn.minWidth = props.actionColumnWidth;
+      const promise = $PROCRUD.getTableDetail(props.tableDesignerName ? props.tableDesignerName : props.tableName);
+      // 加载表格结构
+      promise.then((res) => {
+        const _tableConfig = JSON.parse(res.data.formJson);
+        // eslint-disable-next-line no-shadow
+        const { columns, name, position } = _tableConfig;
+        tableConfig.columns = columns;
+        tableConfig.name = name;
+        tableConfig.position = position;
+        // 如果显示指明了操作列列宽
+        if (props.actionColumnWidth) {
+          const actionColumn = tableConfig.columns.find(_ => _.slotName === 'actionColumn');
+          if (actionColumn) {
+            actionColumn.width = props.actionColumnWidth;
+            actionColumn.minWidth = props.actionColumnWidth;
+          }
         }
-      }
-    });
+      });
+    }
+
 
     // 懒加载
     const treeload = (tree, treeNode?: any, resolve?: any) => {
@@ -601,6 +614,19 @@ export default defineComponent({
         emit('form-change', val);
       },
     };
+
+    // 监听
+    watch(
+      () => props.columns,
+      (val) => {
+        // eslint-disable-next-line no-shadow
+        const { columns, name, position } = val;
+        tableConfig.columns = columns;
+        tableConfig.name = name;
+        tableConfig.position = position;
+      },
+    );
+
     return {
       tableReload,
       ...handlerButtonMethods,

diff --git a/src/component/pro-table/src/ProTable.vue b/src/component/pro-table/src/ProTable.vue
@@ -414,7 +414,6 @@ export default defineComponent({
     watch(
       () => props.columns,
       (val) => {
-        // 此处语法待优化
         // eslint-disable-next-line no-shadow
         const { columns, name, position } = val;
         tableConfig.columns = columns;

diff --git a/src/demo/component/Dashboard.vue b/src/demo/component/Dashboard.vue
@@ -195,7 +195,6 @@
                   tableName="person"
                   :size="size"
                   :textMap="textMap"
-                  :columns="columns"
                   :readOnly="readOnly"
                   :show-header="showHeader"
                   :showPagination="showPagination"