cloudcc-cli 1.2.4 → 1.2.6

package/README.md

@@ -1,3 +1,19 @@
+# ReleaseV1.2.6
+#### 发布日期：2022-11-21
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 替换组件开发模板
+* 优化
+
+# ReleaseV1.2.5
+#### 发布日期：2022-11-17
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 编辑组件添加组件参数
+* 优化
+
 # ReleaseV1.2.4
 #### 发布日期：2022-11-17
 #### 发布范围：全量

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",

package/src/builderPlugin.js

@@ -1,4 +1,4 @@
-const { exec, execSync, spawn, spawnSync } = require('child_process');
+const { exec } = require('child_process');
 const { post } = require('../utils/http');
 const fs = require('fs');
 const path = require("path")
@@ -16,6 +16,7 @@ class Builder {
             devConsoleConfig: {
             },
         }
+        this.plugin = process.argv.splice(2)[0]
     }
     async init() {
         let res = await checkUpdate();
@@ -27,7 +28,12 @@ class Builder {
                 config = { "accessToken": await this.getToken(config) };
             }
             // 获得用户输入
-            let answers = await this.ask();
+            let answers;
+            if (this.plugin) {
+                answers = { buildFileName: this.plugin }
+            } else {
+                answers = await this.ask();
+            }
             // 如果输入的是*.vue，那么表示编译全部文件
             if ("*.vue" == answers.buildFileName) {
                 let dirs = fs.readdirSync("plugin")

package/template/Appvue

@@ -1,26 +1,36 @@
 <template>
-  <div id="app">
-    <cloudcc-input />
+  <div class="app">
+    <div @click="hello">hello CloudCC</div>
+    <Plugin />
   </div>
 </template>
 
 <script>
-import CloudccInput from "../plugin/index.vue";
-export default {
-  name: "App",
-  components: {
-    CloudccInput,
-  },
-};
+  import Plugin from "../plugin/index.vue";
+  export default {
+    name: "App",
+    components: {
+      Plugin,
+    },
+    methods: {
+      hello() {
+        this.$CCDK.CCMessage.showMessage("Hello CloudCC");
+      },
+    },
+  };
 </script>
 
-<style>
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
-}
-</style>
+<style lang="scss">
+  html body {
+    padding: 0;
+    margin: 0;
+    height: 100vh;
+    width: 100%;
+  }
+
+  .app {
+    margin: auto;
+    height: 100px;
+    width: 200px;
+  }
+</style>

package/template/httpjs

@@ -1,6 +1,5 @@
 import axios from 'axios'
 import packageJson from '../package.json'
-import * as CCDK from "cloudcc-ccdk/lib/ccdk.min.js";
 const service = axios.create({
   timeout: 60000, // request timeout
   headers: {
@@ -11,7 +10,7 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
-    config.headers.accessToken = CCDK.CCToken.getToken()
+    config.headers.accessToken = window.$CCDK.CCToken.getToken()
     return config
   },
   error => {
@@ -39,7 +38,7 @@ const formateData = data => {
     head: {
       appType: packageJson.name,
       appVersion: packageJson.version,
-      accessToken: CCDK.CCToken.getToken()
+      accessToken: window.$CCDK.CCToken.getToken()
     },
     body: {
       ...data

package/template/index.js

@@ -44,6 +44,7 @@ module.exports = function (creator, options, callback) {
 
     creator.copyTpl('indexhtml', path.join(public, "index.html"))
 
+
     creator.fs.commit(() => {
         console.log();
         console.log(`${chalk.grey(`创建项目: ${name}`)} ${chalk.green('✔ ')}`);

package/template/indexvue

@@ -1,20 +1,20 @@
 <template>
-  <div class="dev-button" :class="elePropObj.className" @mouseover="myMouseover">
-    <el-button
-      v-loading.fullscreen.lock="fullscreenLoading"
-      element-loading-text="加载中，请稍后..."
-      :style="`font-size:` + elePropObj.fontSize + `px`"
-      :type="elePropObj.type"
-      @click="handleClick"
+  <div class="cloudccButton" @mouseover="myMouseover">
+  <el-button
+    v-loading.fullscreen.lock="fullscreenLoading"
+  element-loading-text="loading..."
+  :style="`font-size:` + elePropObj.fontSize + `px;` + elePropObj.style"
+  :type="elePropObj.type"
+  @click="handleClick"
       >{{ elePropObj.defaultValue }}</el-button
-    >
-  </div>
-</template>
+>
+  </div >
+</template >
 
 <script>
 import axios from "../utils/http";
 export default {
-  name: "dev-button",
+  name: "my-button",
   props: {
     elePropObj: {
       type: Object,
@@ -22,24 +22,42 @@ export default {
     },
     eleEventObj: {
       type: Object,
-      default: () => ({}),
-    }
+      default: () => ({
+        myCreated: `function created(self) {
+           // self即this,本组件的vue实例
+          }`,
+        myMounted: `function mounted(self) {
+           // self即this,本组件的vue实例
+          }`,
+        myDestroyed: `function destroyed(self) {
+           // self即this,本组件的vue实例
+          }`,
+        myMouseover: `function myMouseover(self) {
+           // self即this,本组件的vue实例
+          }`,
+      }),
+    },
+    version: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
       fullscreenLoading: false,
       componentInfo: {
-        component: "dev-button",
-        compName: "按钮-dev",
+        component: "my-button",
+        // 按钮
+        compName: "我的按钮",
         icon: "#icon-anniu",
         sort: 1,
-        bizType: "基础组件",
-        compDesc: "常用的操作按钮。",
+        compDesc: "组件描述信息",
         /* 组件分类：
          * private：私有组件（自己组织可见）
          * beta：组件测试版本
          */
-        category: "private", 
+        category: "private", // public  private
+        version: "0.0.1",
       },
       style: {
         unit: "px",
@@ -51,69 +69,97 @@ export default {
         opacity: 1,
       },
       styleOption: {
-            unit: {
-                lable: "单位",
-                type: "option",
-                options: [
-                    {
-                        value: "px",
-                        label: "像素",
-                    },
-                    {
-                        value: "%",
-                        label: "百分比",
-                    },
-                    {
-                        value: "hw",
-                        label: "视口",
-                    },
-                ],
-            },
-            width: {
-                lable: "宽",
-                type: "input",
-                inputType: "number",
-            },
-            height: {
-                lable: "高",
-                type: "input",
-                inputType: "number",
+        word: {
+          lable: "label.help",
+          type: "word",
+          link: "https://zucfl0psd6.feishu.cn/wiki/wikcnJNCCWZB05fOrvRkBuNQ7re",
+        },
+        unit: {
+          lable: "label.custom.unit",
+          type: "option",
+          options: [
+            {
+              value: "px",
+              label: "label.custom.pixel",
             },
-            top: {
-                lable: "y 坐标",
-                type: "input",
-                inputType: "number",
+            {
+              value: "%",
+              label: "label.percent",
             },
-            left: {
-                lable: "x 坐标",
-                type: "input",
-                inputType: "number",
+            {
+              value: "hw",
+              label: "label.custom.viewport",
             },
+          ],
         },
+        width: {
+          lable: "label.custom.width",
+          type: "input",
+          inputType: "number",
+        },
+        height: {
+          lable: "label.custom.height",
+          type: "input",
+          inputType: "number",
+        },
+        top: {
+          lable: "label.dev.y.coordinate",
+          type: "input",
+          inputType: "number",
+        },
+        left: {
+          lable: "label.dev.x.coordinate",
+          type: "input",
+          inputType: "number",
+        },
+      },
       propObj: {
         id: "",
         pageApi: "createPage",
-        defaultValue: "按钮-dev",
+        defaultValue: "Button",
         type: "primary",
         fontSize: 16,
         functionContent: `function test(conext,value) {
-            alert(JSON.stringify(value.getObject()))
+            let requestParams = {
+              className: "TestUpdate", // 类名 string
+              methodName: "queryGao", // 方法名 string
+              params: [
+                {
+                  "argType": "java.lang.String",
+                  "argValue": "1111",
+                },
+                {
+                  "argType": "java.lang.String",
+                  "argValue": "2222",
+                }
+              ], // 请求参数
+            };
+            return requestParams;
         }`,
         handleComponentId: "",
         axiosAddres: "http://localhost:8080/api/pc/1.0/school/add",
-        className: "",
+        returnBody: `function test(self,res) {
+            console.log(res)
+            if (res.returnCode == 200 || "1" == res.returnCode) {
+              self.$message({
+                message: "提交成功",
+                type: "success",
+              });
+            }
+        }`,
+        style: "",
       },
       propOption: {
-        className: {
-          lable: "tailwind样式，'cc-'开头,多个空格隔开",
+        style: {
+          lable: "label.style",
           type: "input",
         },
         defaultValue: {
-          lable: "默认值",
+          lable: "label.dev.defaultvalue",
           type: "defaultValueInput",
         },
         type: {
-          lable: "主题",
+          lable: "label.dev.button.type",
           type: "option",
           options: [
             {
@@ -139,54 +185,58 @@ export default {
           ],
         },
         fontSize: {
-          lable: "字号",
+          lable: "label.dev.font.size",
           type: "input",
           inputType: "number",
         },
         handleComponentId: {
-          lable: "组件ID,使用英文逗号分隔",
+          lable: "label.dev.associated.compid",
           type: "input",
         },
         functionContent: {
-          lable: "方法体",
+          lable: "label.dev.request.body",
           type: "code",
         },
         axiosAddres: {
-          lable: "网络请求地址",
+          lable: "label.dev.interface.address",
+          type: "code",
+        },
+        returnBody: {
+          lable: "label.dev.return.body",
           type: "code",
         },
       },
-      events:{
-          myCreated: `function created(self) {
+      events: {
+        myCreated: `function created(self) {
            // self即this,本组件的vue实例
           }`,
-          myMounted: `function mounted(self) {
+        myMounted: `function mounted(self) {
            // self即this,本组件的vue实例
           }`,
-          myDestroyed: `function destroyed(self) {
+        myDestroyed: `function destroyed(self) {
            // self即this,本组件的vue实例
           }`,
-          myMouseover: `function myMouseover(self) {
+        myMouseover: `function myMouseover(self) {
            // self即this,本组件的vue实例
           }`,
       },
-      eventsOption:{
-          myCreated: {
-              lable: "创建：",
-              type: "code",
-          },
-          myMounted: {
-              lable: "显示：",
-              type: "code",
-          },
-          myDestroyed: {
-              lable: "销毁：",
-              type: "code",
-          },
-          myMouseover: {
-            lable: "鼠标移入：",
-            type: "code",
-          },
+      eventsOption: {
+        myCreated: {
+          lable: "label.dev.created",
+          type: "code",
+        },
+        myMounted: {
+          lable: "label.dev.mounted",
+          type: "code",
+        },
+        myDestroyed: {
+          lable: "label.dev.destroyed",
+          type: "code",
+        },
+        myMouseover: {
+          lable: "label.dev.mouseover",
+          type: "code",
+        },
       },
       animations: [],
       groupStyle: {},
@@ -194,35 +244,37 @@ export default {
     };
   },
   created() {
-      if (this.$Components.get('editMode') == "edit") { // 编辑模式不触发
-        return
-      }
-      let myCreated = eval(
-          "(false || " + this.eleEventObj.myCreated + ")"
-      );
-      myCreated(this)
+    this.$Components.set(this.elePropObj.id, this);
+    if (this.$Components.get("editMode") == "edit") {
+      // 编辑模式不触发
+      return;
+    }
+    let myCreated = eval("(false || " + this.eleEventObj.myCreated + ")");
+    myCreated(this);
   },
   mounted() {
-      if (this.$Components.get('editMode') == "edit") { // 编辑模式不触发
-        return
-      }
-      let myMounted = eval(
-          "(false || " + this.eleEventObj.myMounted + ")"
-      );
-      myMounted(this)
+    if (this.$Components.get("editMode") == "edit") {
+      // 编辑模式不触发
+      return;
+    }
+    let myMounted = eval("(false || " + this.eleEventObj.myMounted + ")");
+    myMounted(this);
   },
   destroyed() {
-      let myDestroyed = eval(
-          "(false || " + this.eleEventObj.myDestroyed + ")"
-      );
-      myDestroyed(this)
+    let myDestroyed = eval("(false || " + this.eleEventObj.myDestroyed + ")");
+    myDestroyed(this);
   },
   methods: {
     myMouseover() {
       let mouseoverEvent = eval(
-              "(false || " + this.eleEventObj.myMouseover + ")"
+        "(false || " + this.eleEventObj.myMouseover + ")"
       );
-      mouseoverEvent(this)
+      mouseoverEvent(this);
+    },
+    returnBodyHandle(res) {
+      let self = this;
+      let getReturnBody = eval("(false || " + this.elePropObj.returnBody + ")");
+      getReturnBody(self, res);
     },
     handleClick() {
       if (
@@ -256,12 +308,7 @@ export default {
         .then(
           (res) => {
             this.fullscreenLoading = false;
-            if (res.returnCode == 200 || "1" == res.returnCode) {
-              this.$message({
-                message: "提交成功",
-                type: "success",
-              });
-            }
+            this.returnBodyHandle(res);
           },
           (err) => {
             this.fullscreenLoading = false;
@@ -282,15 +329,15 @@ export default {
   },
 };
 </script>
-<style scoped>
-.dev-button {
+<style >
+.cloudccButton {
   height: 100%;
   width: 100%;
   padding: 0px !important;
 }
-.dev-button .el-button {
+.cloudccButton .el-button {
   height: 100%;
   width: 100%;
   padding: 0px !important;
 }
-</style>
+</style>

package/template/mainjs

@@ -4,9 +4,12 @@ Vue.use(ElementUI);
 import 'element-ui/lib/theme-chalk/index.css';
 import App from './App.vue';
 
-Vue.config.productionTip = false
+import * as CCDK from "cloudcc-ccdk/lib/ccdk.min.js";
+Vue.prototype.$CCDK = CCDK
+window.$CCDK = CCDK
 
 Vue.prototype.$Components = new Map()
+Vue.config.productionTip = false
 
 new Vue({
   render: h => h(App),