Merge remote-tracking branch 'origin/build' into build

packages/bigscreen/designer/viewport.vue

@@ -395,19 +395,15 @@ export default {
         }
       })
     },
-    back(params) {
+    back() {
-      if (!!params) {
+      const {id} = this.$route.query
-        const {id} = this.$route.query
+      this.$router.push({hash: "#add", params, query: {id}})
-        this.$router.push({hash: "#add", params, query: {id}})
-      } else {
-        this.$router.back()
-      }
       this.closePage()
     },
     save() {
-      const {did: id} = this.$route.query, {dashboard} = this
+      const {did: id, id: pid} = this.$route.query, {dashboard} = this
       this.instance.post(`/app/appdiylargescreen/addOrUpdateLargeScreen`, {
-        id,
+        id, pid,
         config: JSON.stringify({
           config: this.componentList,
           dashboard,

packages/core/AppMenuManager/list.vue

@@ -48,7 +48,7 @@
         </el-scrollbar>
       </template>
     </ai-list>
-    <ai-dialog :visible.sync="dialog" title="菜单设置" width="500px" @onConfirm="handleSubmit"
+    <ai-dialog :visible.sync="dialog" title="菜单设置" width="500px" @onConfirm="handleSubmit" :close-on-click-modal="false"
                @closed="form={status:1},selected={}">
       <el-form ref="MenuForm" :model="form" size="small" label-width="100px" :rules="rules">
         <el-form-item label="菜单名称" prop="name">
@@ -163,7 +163,7 @@ export default {
     },
     addMenu(row) {
       this.dialog = true
-      this.form = {parentId: row.id}
+      this.form = {parentId: row.id, status: "1"}
       this.selected = row
     },
     handleEdit(row) {

packages/xbot/AppTaskAi/components/TaskAdd.vue

@@ -116,7 +116,7 @@
                 <el-form-item label="地区分布" style="width: 100%;">
                   <div class="area-flex" v-for="(item, index) in areaList" :key="index">
                     <span class="area-label">{{item.areaName}}</span>
-                    <el-input placeholder="请输入" size="small" style="width:100px" v-model="item.proportion" @change="areaNumChange(index)" maxlength="3"></el-input>
+                    <el-input placeholder="请输入" size="small" style="width:100px" v-model="item.proportion" @change="areaNumChange(index)" maxlength="4"></el-input>
                   </div>
                 </el-form-item>
               </div>