@tmagic/table 1.0.0-beta.6 → 1.0.0-rc.2

package/package.json

@@ -1,7 +1,9 @@
 {
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-rc.2",
   "name": "@tmagic/table",
-  "sideEffects": false,
+  "sideEffects": [
+    "dist/*"
+  ],
   "main": "dist/tmagic-table.umd.js",
   "module": "dist/tmagic-table.es.js",
   "types": "dist/types/src/index.d.ts",
@@ -13,8 +15,10 @@
     "./dist/style.css": {
       "import": "./dist/style.css",
       "require": "./dist/style.css"
-    }
+    },
+    "./*": "./*"
   },
+  "license": "Apache-2.0",
   "scripts": {
     "build": "vite build"
   },
@@ -26,22 +30,28 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/form": "^1.0.0-beta.6",
-    "element-plus": "^2.0.2",
+    "@tmagic/form": "^1.0.0-rc.2",
+    "element-plus": "^2.2.0",
     "lodash-es": "^4.17.21",
     "vue": "^3.2.0"
   },
+  "peerDependencies": {
+    "@tmagic/form": "^1.0.0-rc.1",
+    "element-plus": "^2.2.0",
+    "vue": "^3.2.0"
+  },
   "devDependencies": {
     "@types/color": "^3.0.1",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^15.12.4",
     "@vitejs/plugin-vue": "^1.2.3",
     "@vue/compiler-sfc": "^3.2.0",
-    "@vue/test-utils": "^2.0.0-rc.12",
+    "@vue/test-utils": "^2.0.0-rc.20",
     "sass": "^1.35.1",
     "typescript": "^4.3.4",
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
-  }
+  },
+  "gitHead": "3e309780ed33640ab3fc986a93dd0e7b15c167e5"
 }

package/src/ActionsColumn.vue

@@ -6,7 +6,8 @@
         v-show="display(action.display, scope.row) && !editState[scope.$index]"
         v-html="action.text"
         class="action-btn"
-        type="text"
+        text
+        type="primary"
         size="small"
         :key="actionIndex"
         @click="actionHandler(action, scope.row, scope.$index)"
@@ -14,7 +15,8 @@
       <el-button
         class="action-btn"
         v-show="editState[scope.$index]"
-        type="text"
+        text
+        type="primary"
         size="small"
         @click="save(scope.$index, config)"
         >保存</el-button
@@ -22,7 +24,8 @@
       <el-button
         class="action-btn"
         v-show="editState[scope.$index]"
-        type="text"
+        text
+        type="primary"
         size="small"
         @click="editState[scope.$index] = undefined"
         >取消</el-button
@@ -72,9 +75,9 @@ const display = (fuc: boolean | Function | undefined, row: any) => {
   return true;
 };
 
-const success = (msg: string, action: ColumnActionConfig) => {
+const success = (msg: string, action: ColumnActionConfig, row: any) => {
   ElMessage.success(msg);
-  action.after?.();
+  action.after?.(row);
 };
 
 const error = (msg: string) => ElMessage.error(msg);
@@ -89,7 +92,7 @@ const deleteAction = async (action: ColumnActionConfig, row: any) => {
   const res = await action.handler?.(row);
 
   if (res.ret === 0) {
-    success('删除成功!', action);
+    success('删除成功!', action, row);
   } else {
     error(res.msg || '删除失败');
   }
@@ -106,7 +109,7 @@ const copyHandler = async (action: ColumnActionConfig, row: any) => {
     const res = await action.handler?.(row);
 
     if (res.ret === 0) {
-      success('复制成功!', action);
+      success('复制成功!', action, row);
     } else {
       error(`复制失败!${res.msg}`);
     }
@@ -116,6 +119,7 @@ const copyHandler = async (action: ColumnActionConfig, row: any) => {
 };
 
 const actionHandler = async (action: ColumnActionConfig, row: any, index: number) => {
+  await action.before?.(row);
   if (action.type === 'delete') {
     await deleteAction(action, row);
   } else if (action.type === 'copy') {
@@ -124,8 +128,8 @@ const actionHandler = async (action: ColumnActionConfig, row: any, index: number
     props.editState[index] = row;
   } else {
     await action.handler?.(row);
-    action.after?.();
   }
+  action.after?.(row);
 };
 
 const save = async (index: number, config: ColumnConfig) => {

package/src/PopoverColumn.vue

@@ -9,7 +9,7 @@
           :data="scope.row[config.prop]"
         ></m-table>
         <template #reference>
-          <el-button type="text"> {{ config.text || formatter(config, scope.row) }}</el-button>
+          <el-button text type="primary"> {{ config.text || formatter(config, scope.row) }}</el-button>
         </template>
       </el-popover>
     </template>

package/src/Table.vue

@@ -22,7 +22,7 @@
         <expand-column :config="item" :key="columnIndex"></expand-column>
       </template>
 
-      <template v-if="item.selection">
+      <template v-else-if="item.selection">
         <el-table-column type="selection" :key="columnIndex" width="40" :selectable="item.selectable"></el-table-column>
       </template>
 
@@ -95,6 +95,7 @@ export default defineComponent({
     /** 是否显示表头 */
     showHeader: {
       type: Boolean,
+      default: true,
     },
 
     /** 空数据时显示的文本内容 */
@@ -204,9 +205,6 @@ export default defineComponent({
 
 <style lang="scss">
 .m-table {
-  .el-button.action-btn {
-    margin-right: 10px;
-  }
   .el-button.action-btn + .el-button.action-btn {
     margin-left: 0;
   }

package/src/TextColumn.vue

@@ -18,7 +18,7 @@
         ></m-form-container>
       </el-form>
 
-      <el-button v-else-if="config.action === 'actionLink'" type="text" @click="config.handler(scope.row)">
+      <el-button v-else-if="config.action === 'actionLink'" text type="primary" @click="config.handler(scope.row)">
         {{ formatter(config, scope.row) }}
       </el-button>
 
@@ -34,7 +34,7 @@
         <template #content>
           <div>{{ formatter(config, scope.row) }}</div>
         </template>
-        <el-button type="text">扩展配置</el-button>
+        <el-button text type="primary">扩展配置</el-button>
       </el-tooltip>
 
       <el-tag

package/src/schema.ts

@@ -24,7 +24,8 @@ export interface ColumnActionConfig {
   text: string;
   name: string;
   handler?: (row: any) => Promise<any> | any;
-  after?: () => void;
+  before?: (row: any) => void;
+  after?: (row: any) => void;
   action?: (data: { data: any }) => void;
 }
 

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "../..",
-  },
-  "exclude": [
-    "**/dist/**/*"
-  ],
-}

package/vite.config.ts

@@ -1,27 +0,0 @@
-/*
- * Tencent is pleased to support the open source community by making TMagicEditor available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { defineConfig } from 'vite';
-
-import { getBaseConfig } from '../vite-config';
-
-import pkg from './package.json';
-
-const deps = Object.keys(pkg.dependencies);
-
-export default defineConfig(getBaseConfig(deps, 'TMagicTable'));