stash(wox-modules): 图标模块

Lionad-Morotar · Jun 4, 2021 · 848bafb · 848bafb
1 parent 8d4056f
commit 848bafb
Show file tree

Hide file tree

Showing 16 changed files with 2,577 additions and 10 deletions.
diff --git a/build/module/new-module.js b/build/module/new-module.js
@@ -61,6 +61,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../mixins";
 .m-${title} {
 }
 </style>`

diff --git a/packages/wox-editor/package.json b/packages/wox-editor/package.json
@@ -14,7 +14,6 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "ali-oss": "^6.15.2",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.1",
     "eslint": "7.14",

diff --git a/packages/wox-editor/src/segments/screen/index.vue b/packages/wox-editor/src/segments/screen/index.vue
@@ -81,10 +81,10 @@ export default {
     if (this.modules.length === 0) {
       setTimeout(() => {
         this.ADD_MODULE({
-          inits: this.plugins.find(x => x.title === '图片模块')
+          inits: this.plugins.find(x => x.title === '提示文本')
         })
         this.ADD_MODULE({
-          inits: this.plugins.find(x => x.title === '提示文本')
+          inits: this.plugins.find(x => x.title === '图标模块')
         })
         this.ADD_DRAFT()
       }, 200)

diff --git a/packages/wox-forms/index.js b/packages/wox-forms/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
 
-
+// TODO FIXME
 import Vue from 'vue'
 import VueCroppie from 'vue-croppie'
 import Alioss from './plugins/alioss'

diff --git a/packages/wox-forms/package.json b/packages/wox-forms/package.json
@@ -24,6 +24,7 @@
     "url": "https://github.com/wox-builder/wox-forms/issues"
   },
   "dependencies": {
+    "ali-oss": "^6.15.2",
     "element-ui": "^2.15.1",
     "vue": "^2.6.11",
     "vue-color": "^2.8.1",

diff --git a/packages/wox-editor/constant/alioss.js → packages/wox-forms/plugins/alioss/config.js b/packages/wox-editor/constant/alioss.js → packages/wox-forms/plugins/alioss/config.js
diff --git a/packages/wox-forms/plugins/alioss/index.js b/packages/wox-forms/plugins/alioss/index.js
@@ -1,7 +1,7 @@
 import Uploader from './index.vue'
 
 const OSS = require('ali-oss/dist/aliyun-oss-sdk')
-const config = require('constant/alioss').config
+const config = require('./config').config
 
 const client = new OSS(config)
 

diff --git a/packages/wox-modules/alert/meta.json b/packages/wox-modules/alert/meta.json
@@ -3,5 +3,5 @@
   "description": "用于页面中展示重要的提示信息",
   "cover": "https://lego-editor.oss-cn-shanghai.aliyuncs.com/preview/modules/preview-alert.png",
   "is-base-category": true,
-  "categories": ["分割模块"]
+  "categories": ["文本模块"]
 }
diff --git a/packages/wox-modules/components.js b/packages/wox-modules/components.js
@@ -13,6 +13,7 @@ import Space from './space'
 import Procedure from './procedure'
 import Compare from './compare'
 import Alert from './alert'
+import Icon from './icon'
 
 export default {
   getDefaultModuleList () {
@@ -108,10 +109,21 @@ export default {
       "cover": "https://lego-editor.oss-cn-shanghai.aliyuncs.com/preview/modules/preview-alert.png",
       "categories": [
         "基础模块",
-        "分隔模块"
+        "文本模块"
       ],
       "component": Alert,
       "name": "m-alert"
+    },
+    {
+      "title": "图标模块",
+      "description": "图标模块",
+      "cover": "",
+      "categories": [
+        "基础模块",
+        "图标模块"
+      ],
+      "component": Icon,
+      "name": "m-icon"
     }])
   }
 }
diff --git a/packages/wox-modules/components.json b/packages/wox-modules/components.json
@@ -7,5 +7,6 @@
   "space": "./space",
   "procedure": "./procedure",
   "compare": "./compare",
-  "alert": "./alert"
+  "alert": "./alert",
+  "icon": "./icon"
 }