chore(citrus): 升级组件库

app/web/page/editor/component/DynamicForm/component/ColumnSelector/index.vue

@@ -6,7 +6,7 @@
     <Tooltip placement="top" content="两列">
       <Button type="ghost" icon="ios-pause" @click="select(2)"></Button>
     </Tooltip>
-    <Tooltip placement="top" content="多列">
+    <Tooltip placement="top" content="多列" v-if="!hide3Column">
       <Button type="ghost" icon="navicon-round" @click="select(3)" ></Button>
     </Tooltip>
   </div>
@@ -15,6 +15,10 @@
   export default {
     props: {
       value: Number,
+      hide3Column: {
+        type: Boolean,
+        default: false
+      }
     },
     data() {
       return {

app/web/page/editor/component/DynamicForm/component/DiscountGoodsSelector/index.vue

@@ -2,23 +2,23 @@
   <div class="discountGoodsContainer">
     <div class="discountGoodsItem" v-for="(item, index) in goods" :key="index">
       <p>商品{{index + 1}}<span v-if="item.status == 2">(已隐藏，商品已下架)</span></p>
-      <Form @submit.native.prevent ref="formCustom" :model="item" :label-width="80" label-position="left">
+      <Form @submit.native.prevent ref="formCustom" :model="item" :label-width="90" label-position="left">
         <FormItem label="sku_no" prop="skuNo">
           <Input v-model="item.skuNo" placeholder="请输入商品sku编码" @on-focus="setPrevVal(item.skuNo)" @on-blur="getSkuInfo(item.skuNo, index)"></Input>
         </FormItem>
         <FormItem label="商品名称" prop="skuName">
           <Input v-model="item.skuName" placeholder="请输入商品名称"></Input>
         </FormItem>
-        <FormItem label="横幅文案" prop="subtitle">
+        <FormItem label="商品横幅文案" prop="subtitle">
           <Input v-model="item.subtitle" placeholder="请输入商品横幅文案"></Input>
         </FormItem>
-        <FormItem label="标签文案" prop="tag">
+        <FormItem label="商品标签文案" prop="tag">
           <Input v-model="item.tag" placeholder="请输入商品标签文案"></Input>
         </FormItem>
-        <FormItem label="标签颜色" prop="tagColor">
+        <FormItem label="商品标签文案颜色" prop="tagColor">
           <ColorSelector v-model="item.goodsTagFontColor" @input="updateStyle($event, 'tagColor', item)"></ColorSelector>
         </FormItem>
-        <FormItem label="标签背景" prop="tagBg">
+        <FormItem label="商品标签背景" prop="tagBg">
           <Upload v-model="item.goodsTagBgImg" @change="updateStyle($event, 'tagBg', item)"></Upload>
         </FormItem>
       </Form>

app/web/page/editor/component/DynamicForm/index.vue

@@ -14,7 +14,7 @@
           </FormItem>
         </div>
         <FormItem class="Df-component-formitem" v-else :label="item.name" >
-          <component :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>
       </template>
     </Form>

package.json

@@ -27,7 +27,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.9",
-    "@qg/citrus-ui": "0.3.9-beta2",
+    "@qg/citrus-ui": "0.3.9-beta3",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",