fix(editor): 问题修复

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

@@ -28,7 +28,7 @@ export default class DynamicForm extends Vue {
   };
 
   get enableShare() {
-    return this.pageData.props?.showShare;
+    return this.pageData.props?.btAttachVal.some(item => item.perset === '分享');
   }
 
   @Watch('pageData', { immediate: true })

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

@@ -75,7 +75,7 @@
            // uptoken_url: `${config.apiHost}/upload/getToken`, //Ajax请求upToken的Url，**强烈建议设置**（服务端提供）
            save_key: true, // 默认 false。若在服务端生成uptoken的上传策略中指定了 `sava_key`，则开启，SDK会忽略对key的处理
            domain: config.qiniuHost, // bucket 域名，下载资源时用到，**必需**
-           get_new_uptoken: false, // 设置上传文件的时候是否每次都重新获取新的token
+           get_new_uptoken: true, // 设置上传文件的时候是否每次都重新获取新的token
            container: this.containerId, // 上传区域DOM ID，默认是browser_button的父元素，
            max_file_size: '10mb', // 最大文件体积限制
            max_retries: 3, // 上传失败最大重试次数
@@ -174,6 +174,7 @@
         right: 0;
         background: rgba(0, 0, 0, 0.6);
         z-index: 3;
+
         i {
           margin: 0 2px;
           color: #fff;

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

@@ -65,11 +65,6 @@ export default class DynamicPageForm extends Mixins(ContextMenuMixin) {
       name: '返回顶部',
       type: 'SwitchBtn'
     },
-    {
-      key: 'showShare',
-      name: '分享按钮',
-      type: 'checkbox'
-    },
     {
       key: 'btAttachVal',
       name: '添加按钮',

app/web/page/editor/view/dashboard/index.ts

@@ -51,6 +51,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
   isDraging: boolean = false;
   showSubmitPopup: boolean = false;
   inTheSave: boolean = false;
+  searchBarComNum: number = 0;
 
   get pageDataInject() {
     return this.pageData;
@@ -200,7 +201,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
     // component
     } else {
       const y = Math.floor(top / this.gridLayout.rowHeight);
-      this.addElements({ data: {...data, point: { ...data.point, y } }});
+      this.addEleFilter({ data: {...data, point: { ...data.point, y } }});
       this.handleElementClick(this.pageData.elements.length - 1, null);
     }
     // 调整组件高度
@@ -213,12 +214,26 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
       this.handleElementClick(null, null);
     } else {
       const y = getStyle(document.querySelector('.vue-grid-layout'), 'height');
-      this.addElements({ data: {...data, point: { ...data.point, y } }});
+      this.addEleFilter({ data: {...data, point: { ...data.point, y } }});
       this.handleElementClick(this.pageData.elements.length - 1, null);
     }
     // 调整组件高度
     this.$nextTick(() => this.adjustHeight());
   }
+  // 过滤搜索框
+  addEleFilter(el) {
+    if (el.data.name === 'cs-search-bar') {
+      if (this.searchBarComNum === 1) {
+        this.$Notice.warning({
+          title: '搜索框只能添加一个'
+        });
+        return;
+      } else {
+        this.searchBarComNum = 1;
+      }
+    }
+    this.addElements(el);
+  }
 
   resizedEvent(i, h, w) {
     const index = this.pageData.elements.findIndex(ele => ele.point.i === i);

app/web/page/store/modules/editor/state.ts

@@ -91,7 +91,6 @@ export const defaultState = {
         pageBottomTxt: '没有更多啦～',
         pageBottomColor: '#333',
         showBackTop: true,
-        showShare: true,
         btAttachVal: [
           {
             persets: '购物车',

package-lock.json

@@ -1501,12 +1501,12 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.3",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.3.tgz",
-      "integrity": "sha512-4v7SS9FWso7wi0sY9972N1w8jVvaItZkC+es2PN9a1DHcr8vCcawPfSA6EUPqGJ7q15J7q/aRzDXHhhzLe12Dg==",
+      "version": "0.3.4",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.4.tgz",
+      "integrity": "sha512-H7ddsQRKQoTJ/FUg9Q8XZT91UkKcBkQsQW5eKuQPJuUkpY4X52WrHnv2uYbFo0ObyKpUBy1xSxHZbbzHubD79w==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
-        "@qg/cherry-ui": "^2.23.4",
+        "@qg/cherry-ui": "2.23.7",
         "@qg/js-bridge": "^1.1.12",
         "axios": "^0.21.1",
         "intersection-observer": "^0.12.0",

package.json

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