🎉 1.3.0.RELEASE

saber
ssc 4 years ago
parent 50e9bb43d6
commit 5d48a770e4
  1. 4
      package.json
  2. 8
      public/cdn/avue-form-design/index.umd.min.js
  3. 10
      public/cdn/wf-design/index.umd.min.js
  4. 11
      src/views/plugin/workflow/design/form.vue
  5. 42
      src/views/plugin/workflow/process/components/user-option.vue

@ -36,8 +36,8 @@
"@vue/cli-plugin-eslint": "^3.1.5", "@vue/cli-plugin-eslint": "^3.1.5",
"@vue/cli-service": "^3.1.4", "@vue/cli-service": "^3.1.4",
"chai": "^4.1.2", "chai": "^4.1.2",
"node-sass": "^4.12.0", "node-sass": "^6.0.1",
"sass-loader": "^7.0.1", "sass-loader": "^10.0.5",
"vue-template-compiler": "^2.5.17", "vue-template-compiler": "^2.5.17",
"webpack-bundle-analyzer": "^3.0.3" "webpack-bundle-analyzer": "^3.0.3"
}, },

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -330,11 +330,15 @@ export default {
}, },
handleSubmit() { handleSubmit() {
this.$refs.formDesign.getData('string').then(data => { this.$refs.formDesign.getData('string').then(data => {
if (this.isCopy) { this.$refs.formDesign.getData('app').then(appData => {
if (this.isCopy) {
this.copyVisible = true this.copyVisible = true
this.form.content = data this.form.content = data
this.form.appContent = JSON.stringify(appData)
} else { } else {
this.row.content = data this.row.content = data
this.row.appContent = JSON.stringify(appData)
if (this.isNewVersion) { if (this.isNewVersion) {
this.row.newVersion = false this.row.newVersion = false
@ -370,10 +374,11 @@ export default {
}) })
} }
} }
})
}) })
}, },
handleDesign(row) { handleDesign(row) {
this.options = this.deepClone(row.content || '') this.options = this.deepClone(row.content || '{column: []}')
if (row.content) this.isNewVersion = false if (row.content) this.isNewVersion = false
else this.isNewVersion = true else this.isNewVersion = true
this.row = row this.row = row
@ -381,7 +386,7 @@ export default {
this.formVisible = true this.formVisible = true
}, },
handleCopy(row) { handleCopy(row) {
this.options = this.deepClone(row.content || '') this.options = this.deepClone(row.content || '{column: []}')
this.isCopy = true this.isCopy = true
this.formVisible = true this.formVisible = true
}, },

@ -2,7 +2,7 @@
<el-dialog ref="wf-dialog" <el-dialog ref="wf-dialog"
custom-class="wf-dialog" custom-class="wf-dialog"
:visible.sync="visible" :visible.sync="visible"
title="人员配置" title="权限配置"
width="60%" width="60%"
:before-close="handleClose" :before-close="handleClose"
append-to-body> append-to-body>
@ -29,20 +29,20 @@
@click="data.splice($index, 1)"></el-button> @click="data.splice($index, 1)"></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="人员类型" <el-table-column label="类型"
prop="type" prop="type"
align="center" align="center"
header-align="center"> header-align="center">
<template #default="{row, $index}"> <template #default="{row, $index}">
<el-select v-model="row.type" <el-select v-model="row.type"
size="mini" size="mini"
placeholder="人员类型" placeholder="类型"
@change="handleTypeChange($index)"> @change="handleTypeChange($index)">
<el-option v-for="item in typeList" <el-option v-for="item in typeList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:disabled="data.find(d => d.type == item.value)"></el-option> :disabled="Boolean(data.find(d => d.type == item.value))"></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@ -101,6 +101,18 @@
@change="handleChange($index, `post_${$index}`)"> @change="handleChange($index, `post_${$index}`)">
</avue-input-tree> </avue-input-tree>
</template> </template>
<template v-else-if="row.type == 'platform'">
<avue-input-tree :ref="`platform_${$index}`"
v-model="row.value"
size="mini"
dataType="string"
multiple
clearable
placeholder="平台"
:dic="platformList"
@change="handleChange($index, `platform_${$index}`)">
</avue-input-tree>
</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -192,13 +204,35 @@ export default {
}, { }, {
label: '职位', label: '职位',
value: 'post' value: 'post'
}, {
label: '平台',
value: 'platform'
}], }],
typeDic: { typeDic: {
user: '用户', user: '用户',
role: '角色', role: '角色',
dept: '部门', dept: '部门',
post: '职位', post: '职位',
platform: '平台'
}, },
platformList: [
// {
// label: 'PC',
// value: 'pc'
// },
{
label: '移动端H5',
value: 'h5'
}, {
label: '微信小程序',
value: 'mp-wx'
}, {
label: 'IOS',
value: 'ios'
}, {
label: '安卓',
value: 'android'
}]
} }
}, },
methods: { methods: {

Loading…
Cancel
Save