级联

src/components/parser/Parser.vue

@@ -235,6 +235,7 @@ function switchPage(eventName, page) {
  * radio checkbox 其他输入框值处理
  */
 function setOtherValueLabel (event, config) {
+
   let value = this[this.formConf.formModel][config.__vModel__]
   // 临时保存其他的选项值
   this.$nextTick(() => {
@@ -254,24 +255,57 @@ function setOtherValueLabel(event, config) {
  * @param scheme
  */
 function setValueLabel (event, config, scheme) {
+  console.log(event)
+  console.log(config)
+  console.log(scheme)
   // 需要处理的类型 如果是input等则不需要处理
   let tagOptionKey = processType[config.tag]
+
   if (tagOptionKey) {
+
     if (event instanceof Array) {
       // 多选 其他自定义输入
-            let labelArr = new Array()
+
-            if (!event.includes(0)) {
+
+
+      if (!event.includes(0) && config.tag != 'el-cascader') {
         // 如果多选里没有选择其他，就清掉other
         this.$set(this[this.formConf.labelFormModel], `${scheme.__vModel__}other`, '')
         // 同时把输入框清空
         document.querySelector('.' + config.tag).querySelector('.item-other-input').value = ''
       }
+      // debugger
+
+      if (config.tag === 'el-cascader') {
+        let labelFormModelArray = []
+        if (scheme.props.props.multiple) {//多选
+
+          event.forEach(item => {
+            let itemObj = getCascaderData(item, tagOptionKey, scheme)
+            labelFormModelArray.push(itemObj)
+          })
+
+        } else {//单选
+          let itemObj = getCascaderData(event, tagOptionKey, scheme)
+          labelFormModelArray.push(itemObj)
+
+        }
+        this.$set(this[this.formConf.labelFormModel], scheme.__vModel__, labelFormModelArray)
+
+      } else {
+        let labelArr = new Array()
         event.forEach(item => {
           // 拼到头部 其他选项
           let { label } = getObject(_.get(scheme, tagOptionKey), 'value', item)
           labelArr.push(label)
         })
         this.$set(this[this.formConf.labelFormModel], scheme.__vModel__, labelArr.join(','))
+
+      }
+
+      console.log('最终结果')
+      console.log(this[this.formConf.labelFormModel])
+
     } else {
       // 单选 其他自定义输入
       if (event == 0) {
@@ -296,14 +330,38 @@ function setValueLabel(event, config, scheme) {
   }
 }
 
+function getCascaderData (array, tagOptionKey, scheme) {
+  let labelArr = new Array()
+  array.forEach(item => {
+    // 拼到头部 其他选项
+    let { label } = getObject(_.get(scheme, tagOptionKey), 'value', item)
+    labelArr.push(label)
+  })
+
+  const item = array[array.length - 1]
+  let itemObj = getObject(_.get(scheme, tagOptionKey), 'value', item)
+  itemObj.labels = labelArr
+
+  itemObj.pathName = labelArr.join(scheme.separator)
+  return itemObj
+
+}
+
 function getObject (array, key, value) {
+
   let o
   array.some(function iter (a) {
+
+    if (a[key].isArray) {
+      this.getObject(a[key], key, value)
+    } else {
       if (a[key] === value) {
         o = a
         return true
       }
       return Array.isArray(a.children) && a.children.some(iter)
+    }
+
   })
   return o
 }

src/views/form/editor/RightPanel.vue

@@ -1256,7 +1256,7 @@ export default {
       children.splice(index, 1);
     },
     addNode (data) {
-      debugger
+
       data.pid = this.currentPID
       this.currentNode.push(data);
     },

src/views/form/index.vue

@@ -18,7 +18,7 @@
         <el-menu :collapse="isCollapse"
                  :default-active="defaultActiveMenu"
                  class="el-menu-vertical">
-          <el-menu-item v-for="menuItem in (publishStatus? menuItemList2:menuItemList)"
+          <el-menu-item v-for="menuItem in (menuItemList)"
                         :key="menuItem.key"
                         :index="menuItem.route"
                         @click="menuSelectHandle(menuItem.route,menuItem.key)">
@@ -121,6 +121,12 @@ export default {
           icon: 'el-icon-data-line',
           route: '/project/form/statistics'
         },
+        {
+          key: 'publish',
+          title: '发布',
+          icon: 'el-icon-video-play',
+          route: '/project/form/publish'
+        },
         {
           key: 'preview',
           title: '预览',

src/views/form/publish/index.vue

@@ -21,7 +21,7 @@
                        :props="props"
                        :data="data"
                        show-checkbox
-                       :default-expand-all="true" />
+                       :default-expand-all="false" />
             </el-form-item>
           </el-form>
         </div>
@@ -186,7 +186,7 @@ export default {
         agencyId: customerId
       }
       this.$api.post(`/data/aggregator/org/agencytree`, params).then((res) => {
-        debugger
+        this.data = res.data
       })
     },
 
@@ -240,6 +240,16 @@ export default {
       })
     },
     publishProject () {
+      this.resolveAgency()
+      if (this.selAgencyList.length === 0) {
+        this.$message(
+          {
+            message: "请选择发布范围",
+            type: 'warning'
+          }
+        )
+        return false
+      }
 
       this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/publish`, { key: this.projectKey }).then(() => {
         this.publishStatus = true