From 0f1a68f9aa271d93ff9f828939def83249682cb7 Mon Sep 17 00:00:00 2001
From: nana <2841015686@qq.com>
Date: Thu, 23 Mar 2023 01:45:24 +0800
Subject: [PATCH 01/22] =?UTF-8?q?add:=E8=87=AA=E5=AE=9A=E4=B9=89table?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mock/fileMock.js | 12 +++-
vue/App.vue | 61 ++++++++++++++++----
vue/components/Pagination.vue | 73 ++++++++++++++++++++++++
vue/components/Table.vue | 104 ++++++++++++++++++++++++++++++++++
webpack.config.js | 3 +-
5 files changed, 240 insertions(+), 13 deletions(-)
create mode 100644 vue/components/Pagination.vue
create mode 100644 vue/components/Table.vue
diff --git a/mock/fileMock.js b/mock/fileMock.js
index 70ee949..03c0d72 100644
--- a/mock/fileMock.js
+++ b/mock/fileMock.js
@@ -1,2 +1,12 @@
+const tableData = [
+ {name:'小王',sex:'man',age:19,hobby:'游泳',score:9},
+ {name:'小丽',sex:'female',age:18,hobby:'跳舞',score:10},
+ {name:'小燕子',sex:'female',age:17,hobby:'唱歌',score:11},
+ {name:'小栗',sex:'female',age:18,hobby:'游泳',score:23},
+ {name:'小雨',sex:'man',age:20,hobby:'打球',score:22},
+ {name:'小杨',sex:'man',age:21,hobby:'阅读',score:33},
+ {name:'小赵',sex:'female',age:22,hobby:'排球',score:44},
+ {name:'小鹏',sex:'man',age:32,hobby:'睡觉',score:2},
+]
-module.exports = 'test-file-stub';
\ No newline at end of file
+module.exports = {tableData};
diff --git a/vue/App.vue b/vue/App.vue
index c0b8ed2..0a0ab6a 100644
--- a/vue/App.vue
+++ b/vue/App.vue
@@ -1,20 +1,59 @@
-
diff --git a/vue/components/Pagination.vue b/vue/components/Pagination.vue
new file mode 100644
index 0000000..e411bba
--- /dev/null
+++ b/vue/components/Pagination.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+>
diff --git a/vue/components/Table.vue b/vue/components/Table.vue
new file mode 100644
index 0000000..a632e26
--- /dev/null
+++ b/vue/components/Table.vue
@@ -0,0 +1,104 @@
+
+
+
+
+ |
+ {{ col.name }}
+
+ {{
+ sort.key !== col.index ? "排序" : sort.status
+ }}
+ |
+
+
+ |
+ {{ row[col.index] }}
+ |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 33d6dc6..8b21f46 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,7 +7,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
const CompressionPlugin = require("compression-webpack-plugin");
const config = {
- entry: "./src/_test.tsx",
+ entry: "./vue/App.vue",
+ // entry: "./src/_test.tsx",
mode: process.env.NODE_ENV === "development" ? "development" : "production",
output: {
filename: "[name].js",
From 4f42922bf73087024b6b861e1606227ae29b0e11 Mon Sep 17 00:00:00 2001
From: robin <756517553@qq.com>
Date: Mon, 27 Mar 2023 09:45:33 +0800
Subject: [PATCH 02/22] Revert "Daily/shina"
---
mock/fileMock.js | 12 +--
package.json | 4 +-
src/_test.tsx | 4 +-
src/components/table/table.tsx | 168 ++++++---------------------------
src/testTable.tsx | 55 -----------
vue/App.vue | 61 +++---------
vue/components/Pagination.vue | 73 --------------
vue/components/Table.vue | 104 --------------------
webpack.config.js | 3 +-
9 files changed, 46 insertions(+), 438 deletions(-)
delete mode 100644 src/testTable.tsx
delete mode 100644 vue/components/Pagination.vue
delete mode 100644 vue/components/Table.vue
diff --git a/mock/fileMock.js b/mock/fileMock.js
index 03c0d72..70ee949 100644
--- a/mock/fileMock.js
+++ b/mock/fileMock.js
@@ -1,12 +1,2 @@
-const tableData = [
- {name:'小王',sex:'man',age:19,hobby:'游泳',score:9},
- {name:'小丽',sex:'female',age:18,hobby:'跳舞',score:10},
- {name:'小燕子',sex:'female',age:17,hobby:'唱歌',score:11},
- {name:'小栗',sex:'female',age:18,hobby:'游泳',score:23},
- {name:'小雨',sex:'man',age:20,hobby:'打球',score:22},
- {name:'小杨',sex:'man',age:21,hobby:'阅读',score:33},
- {name:'小赵',sex:'female',age:22,hobby:'排球',score:44},
- {name:'小鹏',sex:'man',age:32,hobby:'睡觉',score:2},
-]
-module.exports = {tableData};
+module.exports = 'test-file-stub';
\ No newline at end of file
diff --git a/package.json b/package.json
index ed19abe..6f4b3ba 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
"name": "goji_ui",
"version": "1.0.17",
- "description": "component",
+ "description": "component ",
"main": "dist/cjs/index.js",
- "module": "dist/esm/index.js",
+ "modue": "dist/esm/index.js",
"scripts": {
"build": "rollup -c --bundleConfigAsCjs",
"test": "jest",
diff --git a/src/_test.tsx b/src/_test.tsx
index 1ea254d..b22835b 100644
--- a/src/_test.tsx
+++ b/src/_test.tsx
@@ -4,7 +4,6 @@ import ReactDom from 'react-dom'
import Modal from './components/modal/modal';
import Upload from './components/upload/upload';
import Tab from './components/tab/tab';
-import { TestTable } from './testTable';
import * as GOJI from 'goji_ui'
@@ -29,7 +28,6 @@ function App() {
]}
/> */}
-
test