Merge branch 'featComponent' of https://dd.tall.wiki/gitea/wally/TALL-MUI-3 into featComponent

4 years ago · de02a44d50
7 changed files with 139 additions and 59 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,7 @@
 - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4)
 - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671)
 - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/33927e9)
+ - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411)
 - | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f)
 - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e)
 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644)
@ -41,7 +42,6 @@
 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
- - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/215c6b3)
 - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/22bfe7b)
 - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/17bb8c9)
 - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1421504)
--- a/package-lock.json
+++ b/package-lock.json
@ -3329,7 +3329,7 @@
        },
        "import-cwd": {
          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
          "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
          "dev": true,
          "requires": {
@ -3338,7 +3338,7 @@
        },
        "import-from": {
          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+          "resolved": "https://registry.nlark.com/import-from/download/import-from-2.1.0.tgz",
          "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
          "dev": true,
          "requires": {
@ -3483,7 +3483,7 @@
        },
        "resolve-from": {
          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-3.0.0.tgz",
          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
          "dev": true
        },
@ -4309,7 +4309,6 @@
      "version": "8.0.0",
      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.0.0.tgz",
      "integrity": "sha512-XBEqAoESCyGu3daYmWcTC37Dwmjvs0y40UtUO3MMX+Pd/w7jwNFfUKNtxoMFu0u0wcotP+arDpU3JVH54UV79Q==",
-      "dev": true,
      "requires": {
        "browserslist": "^3.0.0",
        "caniuse-lite": "^1.0.30000808",
@ -4323,7 +4322,6 @@
          "version": "3.2.8",
          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
          "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
-          "dev": true,
          "requires": {
            "caniuse-lite": "^1.0.30000844",
            "electron-to-chromium": "^1.3.47"
@ -4333,7 +4331,6 @@
          "version": "6.0.23",
          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
          "requires": {
            "chalk": "^2.4.1",
            "source-map": "^0.6.1",
@ -4344,7 +4341,6 @@
          "version": "5.5.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
          "requires": {
            "has-flag": "^3.0.0"
          }
@ -7425,9 +7421,9 @@
      "dev": true
    },
    "dayjs": {
-      "version": "1.10.5",
-      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.5.tgz?cache=0&sync_timestamp=1622012271727&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.5.tgz",
-      "integrity": "sha1-VgDfRUj8JFOz8WPrsqu+llzPuYY="
+      "version": "1.10.6",
+      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz",
+      "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
    },
    "de-indent": {
      "version": "1.0.2",
@ -14728,14 +14724,23 @@
      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
    },
    "postcss": {
-      "version": "8.3.5",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz",
-      "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==",
-      "dev": true,
+      "version": "7.0.36",
+      "resolved": "https://registry.nlark.com/postcss/download/postcss-7.0.36.tgz",
+      "integrity": "sha1-BW+M/6k5ZiqPWQWVDAfVKFZE38s=",
      "requires": {
-        "colorette": "^1.2.2",
-        "nanoid": "^3.1.23",
-        "source-map-js": "^0.6.2"
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-6.1.0.tgz?cache=0&sync_timestamp=1622293670728&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
      }
    },
    "postcss-calc": {
@ -18764,15 +18769,13 @@
        },
        "commander": {
          "version": "6.2.1",
-          "resolved": "https://registry.nlark.com/commander/download/commander-6.2.1.tgz?cache=0&sync_timestamp=1624609570521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-6.2.1.tgz",
-          "integrity": "sha1-B5LraC37wyWZm7K4T93duhEKxzw=",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="
        },
        "cosmiconfig": {
          "version": "7.0.0",
-          "resolved": "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-7.0.0.tgz?cache=0&sync_timestamp=1596312863119&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.0.tgz",
-          "integrity": "sha1-75tE13OVnK5j3ezRIt4jhTtg+NM=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
          "requires": {
            "@types/parse-json": "^4.0.0",
            "import-fresh": "^3.2.1",
@ -18783,9 +18786,8 @@
        },
        "fs-extra": {
          "version": "10.0.0",
-          "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz",
-          "integrity": "sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
          "requires": {
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
@ -18794,18 +18796,16 @@
        },
        "glob-parent": {
          "version": "6.0.0",
-          "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.0.tgz?cache=0&sync_timestamp=1620073245729&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.0.tgz",
-          "integrity": "sha1-+FG1mziOeI86RNY/q1A4KyhZwzw=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz",
+          "integrity": "sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww==",
          "requires": {
            "is-glob": "^4.0.1"
          }
        },
        "jsonfile": {
          "version": "6.1.0",
-          "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161933968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
-          "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
@ -18813,52 +18813,70 @@
        },
        "path-type": {
          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz",
-          "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
        },
        "postcss-js": {
          "version": "3.0.3",
-          "resolved": "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz",
-          "integrity": "sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-3.0.3.tgz",
+          "integrity": "sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==",
          "requires": {
            "camelcase-css": "^2.0.1",
            "postcss": "^8.1.6"
+          },
+          "dependencies": {
+            "postcss": {
+              "version": "8.3.5",
+              "resolved": "https://registry.nlark.com/postcss/download/postcss-8.3.5.tgz",
+              "integrity": "sha1-mCIWsRNBK8IKhiiekeuZSVKltwk=",
+              "requires": {
+                "colorette": "^1.2.2",
+                "nanoid": "^3.1.23",
+                "source-map-js": "^0.6.2"
+              }
+            }
          }
        },
        "postcss-nested": {
          "version": "5.0.5",
-          "resolved": "https://registry.npm.taobao.org/postcss-nested/download/postcss-nested-5.0.5.tgz",
-          "integrity": "sha1-8KEH0zqfqxHXY3IF9TIeJyI+NgM=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.5.tgz",
+          "integrity": "sha512-GSRXYz5bccobpTzLQZXOnSOfKl6TwVr5CyAQJUPub4nuRJSOECK5AqurxVgmtxP48p0Kc/ndY/YyS1yqldX0Ew==",
          "requires": {
            "postcss-selector-parser": "^6.0.4"
          }
        },
        "postcss-value-parser": {
          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz?cache=0&sync_timestamp=1588083303810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.1.0.tgz",
-          "integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+          "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
        },
        "purgecss": {
          "version": "4.0.3",
-          "resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-4.0.3.tgz",
-          "integrity": "sha1-gUe0KfnAnbcZ4F1kkI6otnKRN0I=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz",
+          "integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==",
          "requires": {
            "commander": "^6.0.0",
            "glob": "^7.0.0",
            "postcss": "^8.2.1",
            "postcss-selector-parser": "^6.0.2"
+          },
+          "dependencies": {
+            "postcss": {
+              "version": "8.3.5",
+              "resolved": "https://registry.nlark.com/postcss/download/postcss-8.3.5.tgz",
+              "integrity": "sha1-mCIWsRNBK8IKhiiekeuZSVKltwk=",
+              "requires": {
+                "colorette": "^1.2.2",
+                "nanoid": "^3.1.23",
+                "source-map-js": "^0.6.2"
+              }
+            }
          }
        },
        "universalify": {
          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180048005&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz",
-          "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
        }
      }
    },
@ -19704,7 +19722,7 @@
        },
        "hash-sum": {
          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz",
+          "resolved": "https://registry.nlark.com/hash-sum/download/hash-sum-2.0.0.tgz",
          "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
          "dev": true,
          "optional": true
--- a/package.json
+++ b/package.json
@ -62,12 +62,15 @@
    "@tailwindcss/postcss7-compat": "^2.2.0",
    "@vue/shared": "^3.0.0",
    "alloyfinger": "^0.1.16",
+    "autoprefixer": "^8.0.0",
    "core-js": "^3.6.5",
-    "dayjs": "^1.10.5",
+    "dayjs": "^1.10.6",
+    "postcss": "^7",
    "postcss-loader": "^6.1.1",
    "regenerator-runtime": "^0.12.1",
    "register-service-worker": "^1.7.1",
    "right-pad": "^1.0.1",
+    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4",
    "uview-ui": "^1.8.4",
    "vue": "^2.6.11",
    "vuex": "^3.2.0"
--- a/src/components/Title/.gitkeep
+++ b/src/components/Title/.gitkeep
--- a/src/components/Title/Title.vue
+++ b/src/components/Title/Title.vue
@ -0,0 +1,45 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-07-19 11:35:03
+ * @LastEditTime: 2021-07-19 18:37:13
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \TALL-MUI-3\src\components\Title\titleBar.vue
+-->
+<template>
+  <view>
+    <u-navbar back-text="返回">
+      <view class="flex justify-center flex-1">
+        <view v-if="true">{{ title }}</view>
+        <view v-else>{{ titleBar }}</view>
+      </view>
+      <view class="mr-2" slot="right">
+        <u-icon class="m-1" name="checkmark-circle"></u-icon>
+        <u-icon class="m-1" name="reload"></u-icon>
+        <u-icon class="m-1" name="home"></u-icon>
+        <u-icon class="m-1" name="more-dot-fill"></u-icon>
+      </view>
+    </u-navbar>
+    你好
+  </view>
+</template>
+<script>
+export default {
+  name: 'Title',
+  data() {
+    return {
+      title: '加载中...',
+      titleBar: '项目名称',
+      Istrue: 'false',
+    };
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.slot-warp {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
--- a/src/pages.json
+++ b/src/pages.json
@ -3,7 +3,8 @@
    {
      "path": "pages/index/index",
      "style": {
-        "navigationBarTitleText": "uni-app"
+        "navigationStyle": "custom" ,
+			  "navigationBarTextStyle": "white"
      }
    },
    {
@ -23,6 +24,13 @@
      "style": {
        "navigationBarTitleText": "pinch 测试"
      }
+    },
+    {
+      "path": "components/Title/Title",
+      "style": {
+        "navigationStyle": "custom" ,
+			  "navigationBarTextStyle": "white"
+      }
    }
  ],
  "globalStyle": {
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@ -2,11 +2,12 @@
 * @Author: aBin
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 10:09:22
- * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 16:36:17
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-19 18:51:34
 -->
 <template>
  <view>
+    <Title />
    <Roles />
    <view class="container bg-gray-100">
      <Globals class="p-4" />
@ -28,16 +29,21 @@

 <script>
 import Globals from 'components/Globals/index.vue';
+import Title from 'components/Title/Title.vue';
 import Roles from 'components/Roles/Roles.vue';
-// import Project from 'components/Project/Project.vue';
 import TimeLine from 'components/TimeLine/index.vue';

+// import Project from 'components/Project/Project.vue';
+
 export default {
-  components: { Globals, TimeLine, Roles },
+  components: { Globals, TimeLine, Roles, Title },
  data() {
    return { title: 'Hello' };
  },
-  onLoad() {},
+  onLoad() {
+    console.log(this.$u.config.v);
+    // this.openPage();
+  },
  methods: {
    openPage() {
      console.log('open');