Commit 673f0a4d authored by xuguangxing's avatar xuguangxing

feat: 升级组件库

parent ccd8801b
...@@ -100,9 +100,9 @@ export default { ...@@ -100,9 +100,9 @@ export default {
console.log(err); console.log(err);
this.$set(this.data, 'data', []); this.$set(this.data, 'data', []);
} }
setTimeout(() => { // setTimeout(() => {
this.$emit('adjust') // this.$emit('adjust')
}, 1000) // }, 1000)
}, },
changeIds() { changeIds() {
const skus = this.data.ids ? this.data.ids.split(',') : []; const skus = this.data.ids ? this.data.ids.split(',') : [];
...@@ -114,6 +114,8 @@ export default { ...@@ -114,6 +114,8 @@ export default {
this.getGoods({ this.getGoods({
skus: Array.from(new Set(skus)) skus: Array.from(new Set(skus))
}); });
} else {
this.$set(this.data, 'data', []);
} }
}, },
del(index, skuNo) { del(index, skuNo) {
......
...@@ -284,6 +284,13 @@ export default { ...@@ -284,6 +284,13 @@ export default {
link: '' link: ''
}) })
this.showModal = false; this.showModal = false;
this.type = '1';
this.searchParams = {
pageSize: 10,
pageNo: 1,
name: '',
sceneId: ''
}
} }
}, },
data() { data() {
......
...@@ -116,9 +116,9 @@ export default { ...@@ -116,9 +116,9 @@ export default {
console.log(err); console.log(err);
this.$set(this.data, 'data', []); this.$set(this.data, 'data', []);
} }
setTimeout(() => { // setTimeout(() => {
this.$emit('adjust') // this.$emit('adjust')
}, 1000) // }, 1000)
}, },
changeIds() { changeIds() {
const skus = this.data.ids ? this.data.ids.split(',') : []; const skus = this.data.ids ? this.data.ids.split(',') : [];
...@@ -130,6 +130,8 @@ export default { ...@@ -130,6 +130,8 @@ export default {
this.getGoods({ this.getGoods({
skus: Array.from(new Set(skus)) skus: Array.from(new Set(skus))
}); });
} else {
this.$set(this.data, 'data', []);
} }
}, },
del(index, skuNo) { del(index, skuNo) {
......
<template> <template>
<Input v-model="text" :number="true" @on-blur="$emit('adjust')" /> <Input v-model="text" :number="true" />
</template> </template>
<script> <script>
export default { export default {
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<div v-if="item.title"> <div v-if="item.title">
<h3>{{ item.title }}</h3> <h3>{{ item.title }}</h3>
<FormItem :label="child.name" :key="curElement.id + child.key" v-for="child in item.children"> <FormItem :label="child.name" :key="curElement.id + child.key" v-for="child in item.children">
<component @adjust="adjustHeight" :is="getComponent(child.type)" :options="child.options" :formControl="child.formControl" :limit-name="child.type === 'FormList' && curElement.name === 'cs-goods-tabs' ? 'cs-goods' : ''" v-model="form[child.key]" /> <component :is="getComponent(child.type)" :options="child.options" :formControl="child.formControl" :limit-name="child.type === 'FormList' && curElement.name === 'cs-goods-tabs' ? 'cs-goods' : ''" v-model="form[child.key]" />
</FormItem> </FormItem>
</div> </div>
<FormItem class="Df-component-formitem" v-else :label="item.name" :title="item.desc || ''"> <FormItem class="Df-component-formitem" v-else :label="item.name" :title="item.desc || ''">
<component @adjust="adjustHeight" :hide3Column="curElement.name === 'cs-discount' && item.key ==='column'" :is="getComponent(item.type)" :options="item.options" :formControl="item.formControl" :limit-name="item.type === 'ComponentSelect' && curElement.name === 'cs-goods-tabs' ? 'cs-goods' : ''" v-model="form[item.key]" /> <component :hide3Column="curElement.name === 'cs-discount' && item.key ==='column'" :is="getComponent(item.type)" :options="item.options" :formControl="item.formControl" :limit-name="item.type === 'ComponentSelect' && curElement.name === 'cs-goods-tabs' ? 'cs-goods' : ''" v-model="form[item.key]" />
</FormItem> </FormItem>
</template> </template>
</Form> </Form>
......
...@@ -58,6 +58,7 @@ export default class AutoSaveMixin extends Vue { ...@@ -58,6 +58,7 @@ export default class AutoSaveMixin extends Vue {
const record = localStorage.get(`${this.account}-${this.pageId}`); const record = localStorage.get(`${this.account}-${this.pageId}`);
this.setPageInfo(record); this.setPageInfo(record);
this.hasCompared = true; this.hasCompared = true;
localStorage.remove(`${this.account}-${this.pageId}`);
} }
cancel() { cancel() {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"@hubcarl/json-typescript-mapper": "^2.0.0", "@hubcarl/json-typescript-mapper": "^2.0.0",
"@qg/apollo-nodejs": "^2.1.2", "@qg/apollo-nodejs": "^2.1.2",
"@qg/cherry-ui": "2.23.10", "@qg/cherry-ui": "2.23.10",
"@qg/citrus-ui": "0.3.40-beta6", "@qg/citrus-ui": "0.3.40-beta7",
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"@types/lodash": "^4.14.117", "@types/lodash": "^4.14.117",
"@types/node": "^10.12.0", "@types/node": "^10.12.0",
...@@ -3081,9 +3081,9 @@ ...@@ -3081,9 +3081,9 @@
} }
}, },
"node_modules/@qg/citrus-ui": { "node_modules/@qg/citrus-ui": {
"version": "0.3.40-beta6", "version": "0.3.40-beta7",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.40-beta6.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.40-beta7.tgz",
"integrity": "sha512-U5XhIsjBaxD/ZqhhzP3r6QQodv2atMeb0pJ17MfWneQk7itDk8HVTCcu6Og1iZK2mju4hho7qIqhDf0ZyUWNHQ==", "integrity": "sha512-um/dv0G1Xkg5sci76IS6O98gVcyy5umTERpYVsuMy7idG9JfZKYSj1OAtvUi9QGnXqnKQKlZbXxazGiClk6daA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
...@@ -38895,9 +38895,9 @@ ...@@ -38895,9 +38895,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.40-beta6", "version": "0.3.40-beta7",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.40-beta6.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.40-beta7.tgz",
"integrity": "sha512-U5XhIsjBaxD/ZqhhzP3r6QQodv2atMeb0pJ17MfWneQk7itDk8HVTCcu6Og1iZK2mju4hho7qIqhDf0ZyUWNHQ==", "integrity": "sha512-um/dv0G1Xkg5sci76IS6O98gVcyy5umTERpYVsuMy7idG9JfZKYSj1OAtvUi9QGnXqnKQKlZbXxazGiClk6daA==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.23.9", "@qg/cherry-ui": "^2.23.9",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment