🎉 1.1.1.RELEASE

main
ssc 5 years ago
parent 0299e62c25
commit f76277f612
  1. 116
      public/cdn/wf-design/index.umd.min.js
  2. 4
      src/lang/index.js
  3. 4
      src/main.js
  4. 19
      src/views/plugin/workflow/design/index.vue
  5. 5
      src/views/plugin/workflow/process/components/user-select.vue

File diff suppressed because one or more lines are too long

@ -7,16 +7,20 @@ import zhLocale from './zh'
import { getStore } from '@/util/store' import { getStore } from '@/util/store'
Vue.use(VueI18n) Vue.use(VueI18n)
const Avue = window.AVUE; const Avue = window.AVUE;
const WfDesign = window.WfDesign.default;
const messages = { const messages = {
en: { en: {
...enLocale, ...enLocale,
...elementEnLocale, ...elementEnLocale,
...Avue.locale.en, ...Avue.locale.en,
...WfDesign.locale.en,
}, },
zh: { zh: {
...zhLocale, ...zhLocale,
...elementZhLocale, ...elementZhLocale,
...Avue.locale.zh, ...Avue.locale.zh,
...WfDesign.locale.zh,
} }
} }

@ -53,7 +53,9 @@ iconfontVersion.forEach(ele => {
}); });
Vue.use(window.AvueFormDesign) Vue.use(window.AvueFormDesign)
Vue.use(window.WfDesign) Vue.use(window.WfDesign.default, {
i18n: (key, value) => i18n.t(key, value)
})
Vue.config.productionTip = false; Vue.config.productionTip = false;
new Vue({ new Vue({

@ -80,7 +80,7 @@ import { mapGetters } from 'vuex'
export default { export default {
name: 'design', name: 'design',
computed: { computed: {
...mapGetters(['tag', 'isCollapse']), ...mapGetters(['tag', 'isCollapse', 'language']),
}, },
watch: { watch: {
'$route.params.id': { '$route.params.id': {
@ -110,6 +110,23 @@ export default {
}) })
}, },
immediate: true immediate: true
},
language(val) {
const option = {
lang: val
}
if (this.$refs.bpmn2) {
this.$refs.bpmn2.getData('xml', false, false).then(data => {
option.xml = data
this.$set(this.step2, 'option', {
...this.step2.option,
...option
})
})
} else this.$set(this.step2, 'option', {
...this.step2.option,
...option
})
} }
}, },
data() { data() {

@ -6,7 +6,8 @@
width="60%" width="60%"
:before-close="handleClose" :before-close="handleClose"
append-to-body> append-to-body>
<avue-crud :option="crudOption" <avue-crud v-if="visible"
:option="crudOption"
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"
:page.sync="page" :page.sync="page"
@ -172,7 +173,7 @@ export default {
this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data const data = res.data.data
this.page.total = data.total * 3 this.page.total = data.total
this.data = data.records this.data = data.records
this.loading = false this.loading = false
}) })

Loading…
Cancel
Save