Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/assets/css/common.less

@@ -99,9 +99,14 @@
   resize: none;
 }
 .ant-btn-primary {
-  background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important;
-  border: none !important;
-  border-color: transparent !important;
+  background: linear-gradient(90deg, #5ab6ff, #2e9aff) ;
+  border: none ;
+  border-color: transparent ;
+  &:hover,&:focus{
+    background: linear-gradient(90deg, #5ab6ff, #2e9aff) ;
+    border: none ;
+    border-color: transparent ;
+  }
 }
 
 .ant-form-explain {

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue

@@ -64,10 +64,10 @@
                   <a-input v-model="v.value" placeholder="请输入值" />
                 </a-space>
               </div>
-              <a-button type="primary" @click="insertion(i)"
+              <a-button type="primary" @click="insertion(i, 'fieldType')"
                 ><a-icon type="plus"
               /></a-button>
-              <a-button type="danger" @click="delrow(i)"
+              <a-button type="danger" @click="delrow(i, 'fieldType')"
                 ><a-icon type="minus"
               /></a-button>
             </a-space>
@@ -100,10 +100,10 @@
                   <a-input v-model="v.value" placeholder="请输入映射字段" />
                 </a-space>
               </div>
-              <a-button type="primary" @click="insertion(i, 'params')"
+              <a-button type="primary" @click="insertion(i, 'apiParams')"
                 ><a-icon type="plus"
               /></a-button>
-              <a-button type="danger" @click="delrow(i, 'params')"
+              <a-button type="danger" @click="delrow(i, 'apiParams')"
                 ><a-icon type="minus"
               /></a-button>
             </a-space>
@@ -328,7 +328,7 @@ export default {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
           let bol = this.templeteList.some((v) => v.fieldType == "table");
-          if (bol && !this.form.id) {
+          if (bol && !this.form.id && this.form.fieldType == "table") {
             this.$message.warn("只能存在一个表格");
             return;
           }
@@ -346,8 +346,12 @@ export default {
           });
           let res = await saveTemplete({
             ...this.form,
-            fieldTypeValue: fieldTypeObj ? JSON.stringify(fieldTypeObj) : "",
-            serviceApiParams: apiParamsObj ? JSON.stringify(apiParamsObj) : "",
+            fieldTypeValue: !this.$_.isEmpty(fieldTypeObj)
+              ? JSON.stringify(fieldTypeObj)
+              : "",
+            serviceApiParams: !this.$_.isEmpty(apiParamsObj)
+              ? JSON.stringify(apiParamsObj)
+              : "",
           });
           let { code, msg } = res.data;
           if (code === 1) {
@@ -424,25 +428,14 @@ export default {
         key: "",
         value: "",
       };
-      if (type == "params") {
-        this.apiParams.splice(index + 1, 0, obj);
-      } else {
-        this.fieldType.splice(index + 1, 0, obj);
-      }
+      this[type].splice(index + 1, 0, obj);
     },
     // 删除数据配置行数
     delrow(index, type) {
-      if (type == "params") {
-        if (this.apiParams.length == 1) {
-          return;
-        }
-        this.apiParams.splice(index, 1);
-      } else {
-        if (this.fieldType.length == 1) {
+      if (this[type].length == 1) {
         return;
       }
-        this.fieldType.splice(index, 1);
-      }
+      this[type].splice(index, 1);
     },
     // 切换字段类型
     changeFieldType(val) {

base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 评价器 横板皮肤 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       class="call-out-skin-across"
       v-if="imageResolution === '1'"
       :style="{
@@ -125,7 +125,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 呼叫器 横板皮肤 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       class="call-out-skin-across"
       v-if="imageResolution === '1'"
       :style="{
@@ -151,7 +151,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue

@@ -3,7 +3,7 @@
     <!-- 集中显示屏 横板 -->
     <div
       class="centralize-across"
-      :id="conponentsId"
+      :id="componentsId"
       v-if="imageResolution === '1'"
       :style="{
         background: filterItem('1', 0),
@@ -160,7 +160,7 @@
     <!-- 集中显示屏 竖版 -->
     <div
       class="vertical-skin"
-      :id="conponentsId"
+      :id="componentsId"
       v-else-if="imageResolution === '2'"
       :style="{
         background: filterItem('1', 0),
@@ -301,7 +301,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/components/ShowBox.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="show-skin flex aic jcc">
         <component
-          conponentsId="skinInfo"
+          componentsId="skinInfo"
           :is="component"
           :imageResolution="curSkin.imageResolution"
           :skinFieldList="curSkin.skinFieldList"

base-manager-ui/admin/src/pages/basicset/surface/desSelfservice/DesSelfService.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 桌面自助服务终端 横板 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       v-if="imageResolution === '1'"
       class="across-skin flex flexc aic"
       :style="{
@@ -108,7 +108,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 信息发布 横板皮肤 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       class="across-skin flex flexc"
       v-if="imageResolution === '1'"
     >
@@ -45,7 +45,7 @@
     </div>
     <!-- 信息发布 竖版皮肤 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       class="vertical-skin flex flexc"
       v-else-if="imageResolution === '2'"
     >
@@ -114,7 +114,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -6,7 +6,7 @@
       <div class="add-surface-preview">
         <div ref="content" class="add-surface-preview-content">
           <component
-            conponentsId="conponentsId"
+            componentsId="componentsId"
             :is="component"
             :skinFieldList="formData.skinFieldList"
             :imageResolution="formData.imageResolution"
@@ -401,11 +401,11 @@ export default {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.loading = true;
-          let conponentsId = document.getElementById("conponentsId");
-          let info = conponentsId.getBoundingClientRect();
+          let componentsId = document.getElementById("componentsId");
+          let info = componentsId.getBoundingClientRect();
           let width = info.width;
           let height = info.height;
-          html2canvas(conponentsId, {
+          html2canvas(componentsId, {
             backgroundColor: null,
             useCORS: true,
             width: width,
@@ -529,9 +529,9 @@ export default {
     }
     .upload-btn,
     .select-color-btn {
-      background-color: #04cb8f;
+      background: #04cb8f !important;
       color: #fff;
-      border: 1px solid #04cb8f;
+      border: 1px solid #04cb8f !important;
     }
     .color-ipt {
       width: 100%;

base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 排号机 1920*1080 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       class="across-skin"
       v-if="imageResolution === '1'"
       :style="{
@@ -75,7 +75,7 @@
     <!-- 排号机竖版 1080*1920 -->
     <div
       class="vertical-skin"
-      :id="conponentsId"
+      :id="componentsId"
       v-else-if="imageResolution === '2'"
       :style="{
         background: filterItem('1', 0),
@@ -173,7 +173,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/sampleFormSkin/SampleFormSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 样表机 横板 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       v-if="imageResolution === '1'"
       class="sample_form_skin flex flexc aic"
       :style="{
@@ -140,7 +140,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/selfservice/SelfService.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 自助服务终端 横板 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       v-if="imageResolution === '1'"
       class="across-skin flex flexc aic"
       :style="{
@@ -108,7 +108,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/signdeviceskin/SignDeviceSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 导视机 横板 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       v-if="imageResolution === '1'"
       class="across-skin flex flexc aic"
     >
@@ -87,7 +87,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 窗口屏 横板 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       class="window-skin-across flex jcb aic"
       v-if="imageResolution === '1'"
       :style="{
@@ -84,7 +84,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },

base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue

@@ -2,7 +2,7 @@
   <div class="skin-box">
     <!-- 样表机 横板 -->
     <div
-      :id="conponentsId"
+      :id="componentsId"
       v-if="imageResolution === '1'"
       class="sample_form_skin flex flexc aic"
       :style="{
@@ -179,7 +179,7 @@ export default {
       required: true,
       default: "1",
     },
-    conponentsId: {
+    componentsId: {
       required: true,
       type: String,
     },