build: 升级组件库

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

+<template>
+  <div class="VerticalAdGoodsSelectorContainer">
+    <Input
+      v-model="data.ids"
+      type="textarea"
+      :autosize="{minRows: 3,maxRows: 10}"
+      placeholder="请输入skuNo,每个skuNo使用英文逗号隔开"
+      @on-blur="changeIds"
+    />
+  
+    <div class="goodsItem" v-for="(item, index) in data.data" :key="index">
+      <div class="title">
+        商品{{index + 1}}
+      </div>
+      <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" disabled />
+        </FormItem>
+        <FormItem label="商品名称" prop="skuName">
+          <Input v-model="item.skuName" />
+        </FormItem>
+        <FormItem label="商品图片" prop="skuUrl">
+          <Upload v-model="item.skuUrl"></Upload>
+        </FormItem>
+        <FormItem label="商品横幅文案" prop="subTitle">
+          <Input v-model="item.subTitle" />
+        </FormItem>
+      </Form>
+      <Button type="error" long @click="del(index, item.skuNo)" class="deleteGood">删除</Button>
+    </div>
+  </div>
+</template>
+<script>
+import operationApi from '@api/operation.api';
+import Upload from '@editor/component/DynamicForm/component/Upload/index.vue';
+export default {
+  props: {
+    value: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.data = val;
+      }
+    },
+    data: {
+      deep: true,
+      handler(val) {
+        this.$emit('input', val);  
+      }
+    }
+  },
+  components: {
+    Upload
+  },
+  data() {
+    return {
+      data: {}
+    }
+  },
+  created() {
+    this.data = JSON.parse(JSON.stringify(this.value));
+  },
+  methods: {
+   init() {
+      const data = this.value;
+      if (!data.ids) data.ids = '';
+      if (!data.data) data.data = [];
+      this.data = data;
+   }, 
+   async getGoods(params) {
+     let prevDataArr = this.data && this.data.data ? JSON.parse(JSON.stringify(this.data.data)) : [];
+     let skuToInfoMaps = {};
+     for (let i = 0; i < prevDataArr.length; i++) {
+       skuToInfoMaps[prevDataArr[i].skuNo] = prevDataArr[i];
+     }
+     const res = await operationApi.getGoods(params);
+     try {
+       let goodsList = res.skus || [];
+       let arr = [];
+       if (goodsList.length) {
+         for (let i = 0; i < goodsList.length; i++) {
+           let item = {};
+           item.skuName = goodsList[i].skuName;
+           item.salePrice = goodsList[i].salePrice;
+           item.skuNo = goodsList[i].skuNo;
+           item.skuUrl = goodsList[i].skuUrl;
+           item.status = goodsList[i].status;
+           if (skuToInfoMaps[goodsList[i].skuNo]) {
+             item = Object.assign({}, skuToInfoMaps[goodsList[i].skuNo])
+           };
+           arr.push(item);
+         }
+         this.$set(this.data, 'data', arr);
+       } else {
+         this.$set(this.data, 'data', []);
+       }
+     } catch (err) {
+       console.log(err);
+       this.$set(this.data, 'data', []);
+     }
+    //  setTimeout(() => {
+    //    this.$emit('adjust')
+    //  }, 1000)
+   },
+   changeIds() {
+     const ids = this.data && this.data.ids ? this.data.ids.trim() : '';
+     this.data.ids = ids;
+     const skus = ids ? ids.split(',') : [];
+     if (skus.length) {
+       if (skus.length > 30) {
+         this.$toast('最多填入30个商品');
+         return;
+       }
+       this.getGoods({
+         skus: Array.from(new Set(skus))
+       });
+     } else {
+       this.$set(this.data, 'data', []);
+     }
+   },
+   del(index, skuNo) {
+      this.data.data.splice(index, 1)
+      const ids = this.data.ids ? this.data.ids.split(',') : [];
+      const idx = ids.indexOf(skuNo);
+      if (idx > -1 && ids.length) ids.splice(idx, 1);
+      this.data.ids = ids.join();
+      if (this.data.data.length == 0) this.data.ids = '';
+   }
+  }
+}
+</script>
+<style scoped lang="less">
+.goodsItem{
+  border: 1px solid #dddee1;
+  border-radius: 4px;
+  margin-top: 10px;
+  padding: 5px;
+  .title{
+    width: 100%;
+    height: 30px;
+    font-weight: bold;
+  }
+}
+</style>

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

@@ -18,6 +18,7 @@ import DiscountGoodsSelectorV2 from './component/DiscountGoodsSelectorV2/index.v
 import GoodsChannelTypeSelector from './component/GoodsChannelTypeSelector/index.vue';
 import GoodsPromotionTypeSelector from './component/GoodsPromotionTypeSelector/index.vue';
 import GoodsResourceSelector from './component/GoodsResourceSelector/index.vue';
+import GoodsCubeSelector from './component/GoodsCubeSelector/index.vue';
 import BaseSelect from './component/BaseSelect/index.vue';
 import ComponentSelect from './component/ComponentSelect/index.vue';
 import FormList from './component/FormList/index.vue';
@@ -56,7 +57,8 @@ const allComponentsMap = getAllScheme();
   GoodsChannelTypeSelector,
   GoodsPromotionTypeSelector,
   FontWeightSelector,
-  GoodsResourceSelector
+  GoodsResourceSelector,
+  GoodsCubeSelector
 }, name: 'DynamicForm' })
 export default class DynamicForm extends Mixins(ContextMenuMixin, DynamicFormMixin) {
   @State(state => state.editor.curEleIndex) curEleIndex;

package.json

@@ -8,7 +8,7 @@
     "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
-    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=ds npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
+    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=yxm npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
     "build": "npm run tsc && cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
@@ -30,7 +30,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.59",
+    "@qg/citrus-ui": "0.3.60-beta2",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",