chore: multi technology stack structure adjustment

.gitignore

@@ -7,6 +7,7 @@ yarn.lock
 package-lock.json
 /cache
 /src/nutui.ts
+/src/nutui.vue.ts
 /tsc/test
 
 

jd/demo.js

@@ -12,7 +12,7 @@ var demoModel = function(nameLc) {
   </template>
   
   <script lang="ts">
-  import { createComponent } from '@/utils/create';
+  import { createComponent } from '@/packages/utils/create';
   const { createDemo } = createComponent('${nameLc}');
   export default createDemo({
     props: {},
@@ -35,7 +35,7 @@ var demoModel = function(nameLc) {
   </template>
   <script lang="ts">
   import { toRefs } from 'vue';
-  import { createComponent } from '@/utils/create';
+  import { createComponent } from '@/packages/utils/create';
   const { componentName, create } = createComponent('${nameLc}');
   
   export default create({

jd/generate-nutui.js

@@ -8,7 +8,7 @@ config.nav.map(item => {
   item.packages.forEach(element => {
     let { name, show, type } = element;
     if (show) {
-      importStr += `import ${name} from './packages/${name.toLowerCase()}/index${
+      importStr += `import ${name} from './__VUE/${name.toLowerCase()}/index${
         type === 'methods' ? '' : '.vue'
       }';\n`;
       packages.push(name);
@@ -30,7 +30,7 @@ ${installFunction}
 export { ${packages.join(',')}  };
 export default { install, version:'${package.version}'};`;
 fs.outputFile(
-  path.resolve(__dirname, '../src/nutui.ts'),
+  path.resolve(__dirname, '../src/packages/nutui.vue.ts'),
   fileStr,
   'utf8',
   error => {

jd/generate-themes.js

@@ -9,7 +9,10 @@ config.nav.map(item => {
     tasks.push(
       fs
         .copy(
-          path.resolve(__dirname, `../src/packages/${folderName}/index.scss`),
+          path.resolve(
+            __dirname,
+            `../src/packages/__VUE/${folderName}/index.scss`
+          ),
           path.resolve(__dirname, `../dist/packages/${folderName}/index.scss`)
         )
         .then(success => {
@@ -22,7 +25,7 @@ config.nav.map(item => {
 
 tasks.push(
   fs.copy(
-    path.resolve(__dirname, '../src/styles'),
+    path.resolve(__dirname, '../src/packages/styles'),
     path.resolve(__dirname, '../dist/styles')
   )
 );

src/packages/actionsheet/demo.vue

@@ -63,7 +63,7 @@
 
 <script lang="ts">
 import { reactive } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('actionsheet');
 interface Item {
   name: string;

src/packages/actionsheet/index.vue

@@ -38,10 +38,10 @@
   </view>
 </template>
 <script>
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 import { computed } from 'vue';
 const { componentName, create } = createComponent('actionsheet');
-import { popupProps } from '@/packages/popup/index.vue';
+import { popupProps } from '@/packages/__VUE/popup/index.vue';
 export default create({
   props: {
     ...popupProps,

src/packages/address/demo.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script lang="ts">
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 import { reactive, ref, toRefs } from 'vue';
 const { createDemo } = createComponent('address');
 interface CalBack {

src/packages/address/index.vue

@@ -115,7 +115,7 @@
 </template>
 <script lang="ts">
 import { reactive, ref, toRefs, watch, nextTick } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('address');
 import { TweenMax } from 'gsap';
 interface RegionData {

src/packages/avatar/demo.vue

@@ -41,7 +41,7 @@
   </div>
 </template>
 <script lang="ts">
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('avatar');
 export default createDemo({
   props: {},

src/packages/avatar/index.vue

@@ -8,7 +8,7 @@
 </template>
 <script lang="ts">
 import { toRefs, computed } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('avatar');
 export default create({
   props: {

src/packages/backtop/demo.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('backtop');
 
 export default createDemo({

src/packages/backtop/index.vue

@@ -15,7 +15,7 @@ import {
   onDeactivated,
   reactive
 } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('backtop');
 export default create({
   props: {

src/packages/button/demo.vue

@@ -71,7 +71,7 @@
 
 <script lang="ts">
 import { ref } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('button');
 export default createDemo({
   props: {},

src/packages/button/index.vue

@@ -12,7 +12,7 @@
 
 <script lang="ts">
 import { PropType, CSSProperties, toRefs, computed } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('button');
 
 export type ButtonType =

src/packages/calendar/demo.vue

@@ -76,7 +76,7 @@
 
 <script lang="ts">
 import { reactive, toRefs } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 
 const { createDemo } = createComponent('calendar');
 

src/packages/calendar/index.vue

@@ -40,11 +40,11 @@
 </template>
 <script lang="ts">
 import { PropType, ref } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { create } = createComponent('calendar');
-import Popup from '@/packages/popup/index.vue';
-import CalendarItem from '@/packages/calendaritem/index.vue';
-import Utils from '@/utils/date';
+import Popup from '@/packages/__VUE/popup/index.vue';
+import CalendarItem from '@/packages/__VUE/calendaritem/index.vue';
+import Utils from '@/packages/utils/date';
 type InputDate = string | string[];
 export default create({
   children: [CalendarItem, Popup],

src/packages/cell/demo.vue

@@ -43,8 +43,8 @@
 
 <script lang="ts">
 import { ref } from 'vue';
-import { createComponent } from '@/utils/create';
-import { Toast } from '@/nutui';
+import { createComponent } from '@/packages/utils/create';
+import { Toast } from '@/packages/nutui.vue';
 const { createDemo } = createComponent('cell');
 export default createDemo({
   setup() {

src/packages/cell/index.vue

@@ -34,9 +34,9 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 import { useRouter } from 'vue-router';
-import CellGroup from '@/packages/cellgroup/index.vue';
+import CellGroup from '@/packages/__VUE/cellgroup/index.vue';
 const { componentName, create } = createComponent('cell');
 export default create({
   props: {

src/packages/cellgroup/index.vue

@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('cell-group');
 export default create({
   props: {

src/packages/checkbox/demo.vue

@@ -81,8 +81,8 @@
 </template>
 <script lang="ts">
 import { reactive, ref, toRefs, onMounted } from 'vue';
-import { createComponent } from '@/utils/create';
-import { Toast } from '@/nutui';
+import { createComponent } from '@/packages/utils/create';
+import { Toast } from '@/packages/nutui.vue';
 const { createDemo } = createComponent('checkbox');
 export default createDemo({
   setup(props, context) {

src/packages/checkbox/index.vue

@@ -1,9 +1,9 @@
 <script lang="ts">
 import { h, computed, inject, getCurrentInstance, onMounted } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { create, componentName } = createComponent('checkbox');
-import nutIcon from '@/packages/icon/index.vue';
-import CheckboxGroup from '@/packages/checkboxgroup/index.vue';
+import nutIcon from '@/packages/__VUE/icon/index.vue';
+import CheckboxGroup from '@/packages/__VUE/checkboxgroup/index.vue';
 
 export default create({
   children: [CheckboxGroup],

src/packages/checkboxgroup/demo.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts">
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('checkboxgroup');
 export default createDemo({
   props: {},

src/packages/checkboxgroup/index.vue

@@ -8,8 +8,8 @@ import {
   reactive,
   ComponentPublicInstance
 } from 'vue';
-import { createComponent } from '@/utils/create';
-import { useExpose } from '@/utils/useExpose/index';
+import { createComponent } from '@/packages/utils/create';
+import { useExpose } from '@/packages/utils/useExpose/index';
 const { create, componentName } = createComponent('checkboxgroup');
 
 export default create({

src/packages/col/index.vue

@@ -5,7 +5,7 @@
 </template>
 <script lang="ts">
 import { computed, inject } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('col');
 
 export default create({

src/packages/collapse/demo.vue

@@ -81,7 +81,7 @@
 </template>
 <script lang="ts">
 import { reactive, toRefs } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('collapse');
 export default createDemo({
   setup(props, context) {

src/packages/collapse/index.vue

@@ -5,8 +5,8 @@
 </template>
 <script lang="ts">
 import { provide } from 'vue';
-import { createComponent } from '@/utils/create';
-import collapseitem from '@/packages/collapseitem/index.vue';
+import { createComponent } from '@/packages/utils/create';
+import collapseitem from '@/packages/__VUE/collapseitem/index.vue';
 const { create } = createComponent('collapse');
 export default create({
   children: [collapseitem],

src/packages/collapseitem/index.vue

@@ -58,7 +58,7 @@ import {
   getCurrentInstance,
   ComponentInternalInstance
 } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { create, componentName } = createComponent('collapse-item');
 
 export default create({

src/packages/datepicker/demo.vue

@@ -79,7 +79,7 @@
 
 <script lang="ts">
 import { toRefs, watch, ref } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('datepicker');
 export default createDemo({
   props: {},

src/packages/datepicker/index.vue

@@ -12,8 +12,8 @@
 </template>
 <script lang="ts">
 import { toRefs, watch, computed, reactive, onMounted } from 'vue';
-import picker from '@/packages/picker/index.vue';
-import { createComponent } from '@/utils/create';
+import picker from '@/packages/__VUE/picker/index.vue';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('datepicker');
 const currentYear = new Date().getFullYear();
 function isDate(val: Date): val is Date {

src/packages/dialog/demo.vue

@@ -28,9 +28,10 @@
 </template>
 <script lang="ts">
 import { ref } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('dialog');
-import { Dialog } from '@/nutui';
+import { Dialog } from '@/packages/nutui.vue';
+
 export default createDemo({
   setup() {
     const visible = ref(false);

src/packages/dialog/index.vue

@@ -50,10 +50,10 @@
 </template>
 <script lang="ts">
 import { onMounted, computed, watch, ref } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('dialog');
-import Popup, { popupProps } from '@/packages/popup/index.vue';
-import { Button, Icon } from '@/nutui';
+import Popup, { popupProps } from '@/packages/__VUE/popup/index.vue';
+import Button from '@/packages/__VUE/button/index.vue';
 export default create({
   inheritAttrs: false,
   children: [Popup, Button],

src/packages/drag/demo.vue

@@ -32,7 +32,7 @@
 
 <script lang="ts">
 import { ref, reactive, toRefs, watch } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('drag');
 export default createDemo({
   setup() {

src/packages/drag/index.vue

@@ -19,8 +19,8 @@ import {
   ref,
   computed
 } from 'vue';
-import { createComponent } from '@/utils/create';
-import requestAniFrame from '@/utils/raf';
+import { createComponent } from '@/packages/utils/create';
+import requestAniFrame from '@/packages/utils/raf';
 const { componentName, create } = createComponent('drag');
 export default create({
   props: {

src/packages/icon/demo.vue

@@ -39,8 +39,8 @@
 </template>
 
 <script lang="ts">
-import icons from '@/styles/font/iconfont.json';
-import { createComponent } from '@/utils/create';
+import icons from '@/packages/styles/font/iconfont.json';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('icon');
 export default createDemo({
   props: {},

src/packages/icon/index.vue

@@ -1,8 +1,8 @@
 <script lang="ts">
 import { h, PropType } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('icon');
-import { pxCheck } from '@/utils/pxCheck';
+import { pxCheck } from '@/packages/utils/pxCheck';
 
 export default create({
   props: {

src/packages/infiniteloading/demo.vue

@@ -66,7 +66,7 @@
 
 <script lang="ts">
 import { onMounted, ref, reactive, toRefs } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('infiniteloading');
 import { Toast } from '../toast';
 export default createDemo({
@@ -87,9 +87,7 @@ export default createDemo({
         const curLen = data.defultList.length;
 
         for (let i = curLen; i < curLen + 10; i++) {
-          data.defultList.push(
-            `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
-          );
+          data.defultList.push(`${i}`);
         }
 
         if (data.defultList.length > 30) hasMore.value = false;
@@ -102,9 +100,7 @@ export default createDemo({
       setTimeout(() => {
         const curLen = data.customList.length;
         for (let i = curLen; i < curLen + 10; i++) {
-          data.customList.push(
-            `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
-          );
+          data.customList.push(`${i}`);
         }
         if (data.customList.length > 30) customHasMore.value = false;
         done();
@@ -115,9 +111,7 @@ export default createDemo({
       setTimeout(() => {
         const curLen = data.refreshList.length;
         for (let i = curLen; i < curLen + 10; i++) {
-          data.refreshList.push(
-            `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
-          );
+          data.refreshList.push(`${i}`);
         }
         if (data.refreshList.length > 30) refreshHasMore.value = false;
         done();
@@ -133,15 +127,9 @@ export default createDemo({
 
     const init = () => {
       for (let i = 0; i < 10; i++) {
-        data.defultList.push(
-          `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
-        );
-        data.customList.push(
-          `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
-        );
-        data.refreshList.push(
-          `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
-        );
+        data.defultList.push(`${i}`);
+        data.customList.push(`${i}`);
+        data.refreshList.push(`${i}`);
       }
     };
     onMounted(() => {
@@ -173,6 +161,7 @@ export default createDemo({
   margin-top: 10px;
   font-size: 14px;
   color: rgba(100, 100, 100, 1);
+  text-align: center;
 }
 
 .loading {

src/packages/infiniteloading/doc.md

@@ -40,7 +40,7 @@ setup() {
       setTimeout(() => {
         const curLen = data.defultList.length;
         for (let i = curLen; i < curLen + 10; i++) {
-          data.defultList.push(`${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`);
+          data.defultList.push(`${i}`);
         }
         if (data.defultList.length > 30) hasMore.value = false;
         done()
@@ -48,7 +48,7 @@ setup() {
     };
     const init = () => {
       for (let i = 0; i < 10; i++) {
-        data.defultList.push(`${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`);
+        data.defultList.push(`${i}`);
       }
     }
     onMounted(() => {
@@ -90,7 +90,7 @@ setup() {
         const curLen = data.refreshList.length;
         for (let i = curLen; i < curLen + 10; i++) {
           data.refreshList.push(
-            `${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`
+            `${i}`
           );
         }
         if (data.refreshList.length > 30) refreshHasMore.value = false;
@@ -106,7 +106,7 @@ setup() {
     }
     const init = () => {
       for (let i = 0; i < 10; i++) {
-        data.refreshList.push(`${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`);
+        data.refreshList.push(`${i}`);
       }
     }
     onMounted(() => {
@@ -147,7 +147,7 @@ setup() {
       setTimeout(() => {
         const curLen = data.customList.length;
         for (let i = curLen; i < curLen + 10; i++) {
-          data.customList.push(`${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`);
+          data.customList.push(`${i}`);
         }
         if (data.customList.length > 30) customHasMore.value = false;
         done()
@@ -155,7 +155,7 @@ setup() {
     };
     const init = () => {
       for (let i = 0; i < 10; i++) {
-        data.customList.push(`${i} -- 塑像本来就在石头里，我只是把不要的部分去掉`);
+        data.customList.push(`${i}`);
       }
     }
     onMounted(() => {

src/packages/infiniteloading/index.vue

@@ -39,7 +39,7 @@ import {
   computed,
   CSSProperties
 } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('infiniteloading');
 export default create({
   props: {

src/packages/input/demo.vue

@@ -61,7 +61,7 @@
 
 <script lang="ts">
 import { reactive } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('input');
 export default createDemo({
   setup() {

src/packages/input/doc.md

@@ -61,7 +61,7 @@ app.use(Input);
 ### 代码
 ```html
 import { reactive } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('input');
 export default createDemo({
   setup() {

src/packages/input/index.vue

@@ -29,7 +29,7 @@
 </template>
 <script lang="ts">
 import { ref, computed } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 import { formatNumber } from './util';
 
 const { componentName, create } = createComponent('input');

src/packages/inputnumber/demo.vue

@@ -47,7 +47,7 @@
 
 <script lang="ts">
 import { reactive, getCurrentInstance } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('inputnumber');
 export default createDemo({
   props: {},

src/packages/inputnumber/index.vue

@@ -32,8 +32,8 @@
 </template>
 <script lang="ts">
 import { computed } from 'vue';
-import { createComponent } from '@/utils/create';
-import { pxCheck } from '@/utils/pxCheck';
+import { createComponent } from '@/packages/utils/create';
+import { pxCheck } from '@/packages/utils/pxCheck';
 const { componentName, create } = createComponent('inputnumber');
 export default create({
   props: {

src/packages/layout/demo.vue

@@ -117,10 +117,10 @@
 </template>
 
 <script lang="ts">
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('layout');
-import Row from '@/packages/row/index.vue';
-import Col from '@/packages/col/index.vue';
+import Row from '@/packages/__VUE/row/index.vue';
+import Col from '@/packages/__VUE/col/index.vue';
 export default createDemo({
   components: {
     [Row.name]: Row,

src/packages/__VUE/layout/index.vue

@@ -0,0 +1,11 @@
+<script lang="ts">
+import { createComponent } from '@/packages/utils/create';
+const { create } = createComponent('layout');
+import Row from '@/packages/__VUE/row/index.vue';
+import Col from '@/packages/__VUE/col/index.vue';
+export default create({
+  children: [Row, Col]
+});
+</script>
+
+<style lang="scss"></style>

src/packages/menu/demo.vue

@@ -87,7 +87,7 @@
 
 <script lang="ts">
 import { ref, reactive, toRefs } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('menu');
 export default createDemo({
   props: {},

src/packages/menu/index.vue

@@ -5,9 +5,9 @@
 </template>
 <script lang="ts">
 import { toRefs, reactive, provide, computed } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('menu');
-import menuitem from '@/packages/menuitem/index.vue';
+import menuitem from '@/packages/__VUE/menuitem/index.vue';
 export default create({
   children: [menuitem],
   props: {

src/packages/menuitem/index.vue

@@ -46,7 +46,7 @@ import {
   onUnmounted,
   inject
 } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { create, componentName } = createComponent('menu-item');
 export default create({
   props: {

src/packages/navbar/demo.vue

@@ -71,7 +71,7 @@
 
 <script lang="ts">
 import { reactive } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 const { createDemo } = createComponent('navbar');
 export default createDemo({
   setup(props, { emit }) {

src/packages/navbar/index.vue

@@ -60,7 +60,7 @@
 
 <script lang="ts">
 import { computed, ref } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 import { useRouter } from 'vue-router';
 const { componentName, create } = createComponent('navbar');
 export default create({

src/packages/notify/demo.vue

@@ -60,7 +60,7 @@
 
 <script lang="ts">
 import { createApp } from 'vue';
-import { createComponent } from '@/utils/create';
+import { createComponent } from '@/packages/utils/create';
 import { Notify } from './notify';
 const { createDemo } = createComponent('notify');
 export default createDemo({