tianheng-ui 0.1.11 → 0.1.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/FormMaking/GenerateForm.vue

@@ -22,6 +22,7 @@
         :prop="item.type === 'grid' ? '' : item.model"
         :componentsData="componentsData"
         @input-change="onInputChange"
+        @button-submit="handleButtonSubmit"
       >
         <template v-for="name in slotKeys" :slot="name">
           <slot :name="name" />
@@ -132,6 +133,7 @@ export default {
     }
   },
   created() {
+    localStorage.setItem("_TH_OauthConfig", JSON.stringify(this.oauthConfig));
     this.axios = Axios.init(this.oauthConfig);
     this.generateModle(this.formJson.list);
   },
@@ -225,7 +227,7 @@ export default {
 
       const remoteFunc = item.options.remoteFunc;
       this.axios({
-        url: remoteFunc.api,
+        url: remoteFunc.url,
         method: remoteFunc.method,
         headers: remoteFunc.headers,
         data: { ...remoteFunc.params }
@@ -240,6 +242,9 @@ export default {
         });
       });
     },
+    handleButtonSubmit(val){
+      this.$emit("button-submit", val);
+    },
     getData() {
       return new Promise((resolve, reject) => {
         this.$refs.generateForm.validate(valid => {

package/packages/FormMaking/GenerateFormItem.vue

@@ -28,6 +28,7 @@
       :prop="prop"
       :slotKeys="slotKeys"
       :componentsData="componentsData"
+      @button-submit="handleButtonSubmit"
     ></component>
 
     <!-- <template v-if="widget.type == 'input'">
@@ -169,7 +170,7 @@
 </template>
 
 <script>
-import { inputTypeDict } from "./util/index";
+import { inputTypeDict, deepClone } from "./util/index";
 import { VueEditor } from "vue2-editor";
 import compsData from "./custom/register";
 import FmUpload from "./Upload";
@@ -188,7 +189,7 @@ export default {
   components: { FmUpload, VueEditor },
   data() {
     return {
-      compsData: JSON.parse(JSON.stringify(compsData)),
+      compsData: deepClone(compsData),
       dataModel: this.models[this.widget.model],
       dialogVisible: false,
       dialogImageUrl: ""
@@ -227,7 +228,7 @@ export default {
         let baseUrl = "";
         if (info) baseUrl = JSON.parse(info).baseUrl;
 
-        return `${baseUrl}/${this.widget.options.remoteFunc.api}`;
+        return `${baseUrl}/${this.widget.options.remoteFunc.url}`;
       } else {
         return this.widget.options.action;
       }
@@ -311,6 +312,9 @@ export default {
     handleTableDelete(index) {
       this.dataModel.splice(index, 1);
     },
+    handleButtonSubmit(val) {
+      this.$emit("button-submit", val);
+    },
 
     // 支撑 JavaScript 动态编译
     handleEventAction(key) {
@@ -320,7 +324,7 @@ export default {
       for (let i = 0; i < eventScript.length; i++) {
         const element = eventScript[i];
         if (element.key === key) {
-          const func = `(item,value)=>{${element.func}}`;
+          const func = `(item,value)=>{${element.value}}`;
           eval(func)(this.widget, this.dataModel);
         }
       }
@@ -367,7 +371,7 @@ export default {
       }
     },
     // 获取数据，仅支持获取当前组件节点下的数据
-    getData() {
+    getData(obj) {
       return this.models;
     }
   }

package/packages/FormMaking/GenerateFormItemH5.vue

@@ -774,7 +774,7 @@ export default {
       for (let i = 0; i < eventScript.length; i++) {
         const element = eventScript[i];
         if (element.key === key) {
-          const func = `(item,value)=>{${element.func}}`;
+          const func = `(item,value)=>{${element.value}}`;
           eval(func)(this.widget, this.dataModel);
         }
       }

package/packages/FormMaking/WidgetConfig.vue

@@ -31,7 +31,6 @@
     <component
       :widget="data"
       :config="config"
-      :remoteApis="remoteApis"
       :is="compsData[data.type].content"
       @events-show="handleEventDialogShow"
       @events-edit="handleEventsCollapseClick"
@@ -45,9 +44,13 @@
     >
       <div class="eventsSetting">
         <div class="list">
-          <div class="list-header" @click="handleAddEvent">
+          <div class="list-header">
             <div>动作库</div>
-            <el-button type="text" icon="el-icon-plus" size="mini"
+            <el-button
+              type="text"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAddEvent"
               >添加</el-button
             >
           </div>
@@ -58,9 +61,9 @@
             @click="eventsDialog.active = item"
           >
             <div class="list-item-title">Function</div>
-            <div class="list-item-value">{{ item.name }}</div>
+            <div class="list-item-value">{{ item.label }}</div>
             <el-popconfirm
-              :title="`是否确定删除方法 ${item.name}`"
+              :title="`是否确定删除方法 ${item.label}`"
               confirm-button-text="删除"
               confirm-button-type="danger"
               @confirm="handleEventDialogDelete(item, index)"
@@ -73,12 +76,12 @@
           <div>
             <span>Function Name</span>
             <el-input
-              v-model="eventsDialog.active.name"
+              v-model="eventsDialog.active.label"
               placeholder="请输入动作名称"
               size="small"
               :disabled="
-                eventsDialog.active.name === 'mounted' ||
-                  eventsDialog.active.name === 'refresh'
+                eventsDialog.active.label === 'mounted' ||
+                  eventsDialog.active.label === 'refresh'
               "
             ></el-input>
           </div>
@@ -86,8 +89,8 @@
             <div>
               function(
               {{
-                eventsDialog.active.name !== "mounted" &&
-                eventsDialog.active.name !== "refresh"
+                eventsDialog.active.label !== "mounted" &&
+                eventsDialog.active.label !== "refresh"
                   ? "item,value"
                   : ""
               }}
@@ -104,17 +107,21 @@
                   slot="reference"
                   class="el-icon-question"
                 ></i>
-                <div class="functions">
-                  <div>setData</div>
-                  <div>getData</div>
-                  <div>display</div>
-                  <div>hide</div>
+                <div>
+                  <div
+                    style="display: flex;justify-content: space-between;"
+                    v-for="item in aceCompletions"
+                    :key="item.caption"
+                  >
+                    <div>{{ item.caption }}</div>
+                    <div>{{ item.meta }}</div>
+                  </div>
                 </div>
               </el-popover>
             </div>
             <th-code-editor
               style="height:calc(100% - 48px)"
-              v-model="eventsDialog.active.func"
+              v-model="eventsDialog.active.value"
               :completions="aceCompletions"
               ref="codeEditor"
             ></th-code-editor>
@@ -135,6 +142,7 @@
 </template>
 
 <script>
+import { deepClone } from "./util/index";
 import compsData from "./custom/register";
 export default {
   props: {
@@ -144,12 +152,6 @@ export default {
         return {};
       }
     },
-    remoteApis: {
-      type: Array,
-      default: () => {
-        return [];
-      }
-    },
     config: {
       type: Object,
       default: () => {
@@ -159,7 +161,7 @@ export default {
   },
   data() {
     return {
-      compsData: JSON.parse(JSON.stringify(compsData)),
+      compsData: deepClone(compsData),
       validator: {
         type: null,
         required: null,
@@ -196,6 +198,12 @@ export default {
           caption: "hide",
           value: "hide([ ])",
           score: 1
+        },
+        {
+          meta: "跳转页面",
+          caption: "goPage",
+          value: "goPage({path:'',query:{}})",
+          score: 1
         }
       ]
     };
@@ -317,16 +325,16 @@ export default {
     handleEventDialogShow() {
       this.eventsDialog = {
         visible: true,
-        eventScript: JSON.parse(JSON.stringify(this.config.eventScript)),
+        eventScript: deepClone(this.config.eventScript),
         active: null
       };
     },
     handleAddEvent() {
       const key = new Date().getTime();
       const dic = {
-        key: key,
-        name: key,
-        func: ""
+        id: key,
+        label: key,
+        value: ""
       };
       this.eventsDialog.eventScript.push(dic);
       this.eventsDialog.active = dic;
@@ -365,30 +373,15 @@ export default {
       }
     },
     handleTypeChange(val) {
-      const config = JSON.parse(JSON.stringify(this.compsData[val].config));
+      const config = deepClone(this.compsData[val].config);
       this.$emit("update", config);
     }
   }
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .widgetConfig {
-  .remoteApis {
-    width: 100%;
-    margin-bottom: 6px;
-
-    /deep/ .el-input--prefix .el-input__inner {
-      padding-left: 85px;
-    }
-
-    /deep/ .el-input__prefix {
-      left: 0;
-      width: 75px;
-      color: #999;
-    }
-  }
-
   .el-dialog__body {
     padding: 20px;
   }
@@ -453,7 +446,7 @@ export default {
         margin-bottom: 20px;
         padding-left: 10px;
 
-        /deep/ .el-input {
+        .el-input {
           flex: 1;
           margin-left: 10px;
         }
@@ -483,16 +476,11 @@ export default {
   .selectableRange {
     width: 100%;
 
-    /deep/ .el-range-separator {
+    .el-range-separator {
       width: 20px;
     }
   }
 
-  .functions {
-    span {
-      margin: 0 5px;
-    }
-  }
   .flexView {
     display: flex;
     align-items: center;

package/packages/FormMaking/WidgetForm.vue

@@ -44,6 +44,7 @@
 </template>
 
 <script>
+import { deepClone } from "./util/index";
 import Draggable from "vuedraggable";
 import WidgetFormItem from "./WidgetFormItem.vue";
 
@@ -99,18 +100,16 @@ export default {
     },
     handleWidgetAdd(evt) {
       const newIndex = evt.newIndex;
-      const to = evt.to;
-
+      let newComponent = deepClone(this.data.list[newIndex]);
       //为拖拽到容器的元素添加唯一 key
-      const key =
-        Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
-      let dic = JSON.parse(JSON.stringify(this.data.list[newIndex]));
-      dic.key = key;
-      dic.model = dic.type + "_" + key;
-      // dic.rules = [{ id: new Date().getTime(), patternStr: "", pattern: "" }];
-
-      this.$set(this.data.list, newIndex, dic);
+      if (!newComponent.key) {
+        const key =
+          Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
+        newComponent.key = key;
+        newComponent.model = newComponent.type + "_" + key;
+      }
 
+      this.$set(this.data.list, newIndex, newComponent);
       this.selectWidget = this.data.list[newIndex];
     }
   }

package/packages/FormMaking/WidgetFormItem.vue

@@ -50,6 +50,7 @@
 </template>
 
 <script>
+import { deepClone } from "./util/index";
 import compsData from "./custom/register";
 import Draggable from "vuedraggable";
 import FmUpload from "./Upload";
@@ -59,7 +60,7 @@ export default {
   components: { Draggable, FmUpload },
   data() {
     return {
-      compsData: JSON.parse(JSON.stringify(compsData)),
+      compsData: deepClone(compsData),
       selectWidget: this.select
     };
   },
@@ -130,7 +131,6 @@ export default {
         )}`;
 
         item.key = key;
-        item.options.remoteFunc = `func__${key}`;
         item.model = `${item.type}_${key}`;
 
         if (["table", "tableH5"].includes(item.type)) {

package/packages/FormMaking/WidgetSelect.vue

@@ -72,7 +72,6 @@ export default {
         )}`;
 
         item.key = key;
-        item.options.remoteFunc = `func__${key}`;
         item.model = `${item.type}_${key}`;
 
         if (["table", "tableH5"].includes(item.type)) {