Merge branch 'master' of http://47.110.251.215:3000/web/saber

src/components/table-form/hc-form-checkbox-group.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <el-checkbox-group v-model="isVal" size="large">
+      <template v-for="item in datas">
+        <el-checkbox :label="item" />
+      </template>
+      <template v-for="item in objs">
+        <el-checkbox :label="item.key">{{item.name}}</el-checkbox>
+      </template>
+    </el-checkbox-group>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "HcFormCheckboxGroup",
+  props: {
+    datas: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    objs: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    val: {
+      type: [Number,String],
+      default: ''
+    },
+    keyname: {
+      type: [Number,String],
+      default: ''
+    },
+  },
+  data() {
+    return {
+      isVal: []
+    }
+  },
+};
+</script>

src/main.js

@@ -24,6 +24,7 @@ import thirdRegister from './components/third-register/main';
 import flowDesign from './components/flow-design/main';
 import HcTableFormUpload from './components/table-form/hc-form-upload';
 import HcFormSelectSearch from './components/table-form/hc-form-select-search';
+import HcFormCheckboxGroup from './components/table-form/hc-form-checkbox-group';
 import avueUeditor from 'avue-plugin-ueditor';
 import website from '@/config/website';
 import crudCommon from '@/mixins/crud';
@@ -57,6 +58,7 @@ Vue.component('flowDesign', flowDesign);
 Vue.component('tenantPackage', tenantPackage);
 Vue.component('HcTableFormUpload', HcTableFormUpload);
 Vue.component('HcFormSelectSearch', HcFormSelectSearch);
+Vue.component('HcFormCheckboxGroup', HcFormCheckboxGroup);
 // 加载相关url地址
 Object.keys(urls).forEach(key => {
     Vue.prototype[key] = urls[key];

src/views/manager/projectinfo/editElement/editElement.vue

@@ -226,6 +226,7 @@ import FormulaEdit from '@/views/formula/edit.vue'
 import { getExcelHtml } from '@/api/exctab/excelmodel'
 import { getElementInfoByTabId, submit, dictionarydataType, submitBatch } from '@/api/exctab/editelement'
 import Vue from 'vue'
+
 export default {
   components:{
     FormulaEdit

src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -126,7 +126,8 @@ export default {
           formUploadError(){},
           uploadprogress(){},
           formRemoteMethod(){},
-          getRegularExpression(){}
+          getRegularExpression(){},
+          checkboxGroupChange(){}
         }
       })
       var component = new MyComponent().$mount()
@@ -155,6 +156,7 @@ export default {
           uploadprogress(){},
           getRegularExpression(){},
           formRemoteMethod(){},
+          checkboxGroupChange(){}
         }
       })
       var component = new MyComponent().$mount()