cloud-web-corejs 1.1.0-dev.26 → 1.1.0-dev.28

package/src/components/hiprint/style.scss

@@ -0,0 +1,188 @@
+// Core hiprint designer chrome extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+@import "~@base/styles/mixin.scss";
+
+//打印盒子
+.button-zoom {
+  height: 28px;
+  border-radius: 2px;
+  line-height: 28px;
+  padding: 0 !important;
+  vertical-align: middle;
+  width: 28px;
+}
+.print-design {
+  background-color: #fff;
+  button.el-button {
+    padding: 5px 12px;
+    &.button-sty {
+      color: #fff;
+      font-size: 12px;
+      line-height: 26px;
+      padding: 0 12px;
+    }
+  }
+  .pd-box-tabs {
+    padding: 10px 0 0 24px;
+    border-bottom: solid 1px $borderColor;
+    .el-button-group .el-button {
+      border-radius: 8px 8px 0 0 !important;
+      margin-right: 8px;
+      padding: 8px 14px;
+      border: none;
+      &.el-button--info {
+        background: #f0f0f0;
+        color: grey;
+      }
+      &.el-button--primary {
+        color: #fff;
+      }
+    }
+  }
+  .el-card {
+    box-shadow: none !important;
+    border: none;
+    margin-top: 0;
+    > .el-card__body {
+      padding: 0;
+    }
+    &.card-design > .el-card__body {
+      padding: 20px;
+      border-left: solid 1px #eee;
+      border-right: solid 1px #eee;
+      overflow: auto;
+      height: calc(100vh - 189px);
+      width: 100%;
+    }
+  }
+  .params_setting_container > .el-card > .el-card__body {
+    overflow: auto;
+    height: calc(100vh - 189px);
+  }
+  .print-oper {
+    border-bottom: solid 1px $borderColor;
+    padding: 8px;
+    .el-button-group .el-button {
+      color: #000;
+      &.el-button--primary {
+        color: #fff;
+      }
+    }
+    .el-button-group + .el-button,
+    .el-button + .el-input-number,
+    .el-input-number + .el-button,
+    .el-button-group + .el-button-group,
+    .el-button + .el-button-group,
+    .el-input-number + .el-button-group {
+      margin-left: 10px;
+    }
+    .el-radio-group label {
+      margin-bottom: 0;
+    }
+    .el-input-number {
+      vertical-align: middle;
+      [role="button"] {
+        margin-top: 0;
+      }
+    }
+    .el-input-number.noButton {
+      line-height: 26px;
+    }
+  }
+  .drag_item_title {
+    font-size: 13px;
+    padding: 12px 6px 6px 6px;
+    font-weight: bold;
+  }
+  .drag_item_box {
+    padding: 2px 0 4px 5px;
+    .ep-draggable-item {
+      @include ellipsis;
+      display: inline-block;
+      height: 60px;
+      line-height: 28px;
+      width: 76px;
+      float: left;
+      cursor: move;
+      background: #f1f2f3;
+      font-size: $fontSizeBase;
+      text-align: center;
+      .glyphicon {
+        display: block;
+        margin: 10px auto 2px;
+        font-size: 18px;
+        color: #409eff;
+      }
+      &:hover {
+        background: #ebeef5;
+        outline: 1px solid #409eff;
+      }
+    }
+  }
+  .params_setting_container {
+    .prop-tabs {
+      padding: 0 8px;
+      .prop-tab-items {
+        height: 38px;
+        line-height: 38px;
+        border-bottom: solid 2px #dfe4ed;
+        padding: 0;
+        .prop-tab-item {
+          margin: 0;
+          &.active {
+            border-bottom-color: $baseColor;
+            color: $baseColor;
+            height: 38px;
+            line-height: 38px;
+          }
+          .tab-title {
+            font-weight: 400;
+            font-size: $fontSizeBase;
+          }
+        }
+      }
+    }
+    .hiprint-option-item {
+      .hiprint-option-item-label {
+        font-size: 13px;
+        margin-top: 8px;
+      }
+      .hiprint-option-item-field {
+        textarea,
+        input,
+        select {
+          border-radius: 2px;
+          border: 1px solid #dcdfe6;
+          color: #606266;
+          height: 28px;
+          padding: 4px 8px;
+        }
+        input.minicolors-input {
+          padding-left: 23px;
+        }
+        .minicolors-swatch {
+          left: 5px;
+          top: 6px;
+          border-radius: 2px;
+        }
+      }
+    }
+    .hiprint-option-item-settingBtn {
+      min-width: 96px;
+      height: 28px;
+      border-radius: 2px;
+      padding: 0 8px;
+      font-size: $fontSizeBase;
+      line-height: 25px;
+      cursor: pointer;
+      background-color: $baseColor;
+    }
+  }
+  .hiprint-printElement-type {
+    .title {
+      font-size: 13px;
+      padding: 12px 6px 6px 6px;
+      font-weight: bold;
+    }
+  }
+}

package/src/components/jsonImport/index.vue

@@ -21,7 +21,7 @@
           </div>
         </el-upload>
         <div class="upload-finish" v-if="fileRaw">
-          <img :src="$assetUrl(require('@/resources' + '/images/ico-txt.svg'))" class="ico"/>
+          <img :src="$assetUrl(require('@base/core-resources' + '/images/ico-txt.svg'))" class="ico"/>
           <p class="name">{{ fileRaw.name }}</p>
           <!-- <p>2022-1-17</p> -->
           <el-tooltip :enterable="false" class="item" effect="dark"

package/src/components/langImport/index.vue

@@ -21,7 +21,7 @@
           </div>
         </el-upload>
         <div class="upload-finish" v-if="fileRaw">
-          <img :src="$assetUrl(require('@/resources' + '/images/ico-txt.svg'))" class="ico"/>
+          <img :src="$assetUrl(require('@base/core-resources' + '/images/ico-txt.svg'))" class="ico"/>
           <p class="name">{{ fileRaw.name }}</p>
           <!-- <p>2022-1-17</p> -->
           <el-tooltip :enterable="false" class="item" effect="dark"

package/src/components/mobile/buttonGroup/index.vue

@@ -34,5 +34,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@import "~@/resources/css/h5.scss";
+@import "~@base/core-resources/css/h5.scss";
 </style>

package/src/components/obsUpload/index.vue

@@ -20,7 +20,7 @@
           </div>
           <ul class="el-upload-list el-upload-list--picture">
             <div class="nodata" v-if="pasteList.length == 0">
-              <img :src="$assetUrl(require('@/resources/images/nodata2.png'))" />
+              <img :src="$assetUrl(require('@base/core-resources/images/nodata2.png'))" />
             </div>
             <li v-for="(pasteFile,index) in pasteList" :key="index" class="el-upload-list__item is-success">
               <div>

package/src/components/onlineTalk/index.vue

@@ -293,7 +293,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import '~@/styles/variables.scss';
+@import '~@base/styles/variables.scss';
 .onlieTalk-search-list{
   list-style: none;margin: -8px -4px 0;padding: 0;min-width: 360px;max-width: 90%;
   .tit{color: #333;font-size: 14px;margin: 10px 0 3px;padding-left: 6px;
@@ -493,7 +493,7 @@ export default {
 
 
 .ico-online {
-  background: url(~@/resources/images/ico-service.png) no-repeat center 19px #FFF;
+  background: url(~@base/core-resources/images/ico-service.png) no-repeat center 19px #FFF;
   background-size: 40px;
   position: fixed;
   right: 28px;

package/src/components/table/index.js

@@ -890,6 +890,9 @@ function initOption(opts) {
   result = configUtil.extendDeeply(defaultOptions, config);
   applyTableFeatureDisabled(result, that);
 
+  if (!result.pagerConfig) {
+    return result;
+  }
   let pageSize = result.pagerConfig.pageSize;
   let pageSizes = result.pagerConfig.pageSizes;
   if (pageSizes && !pageSizes.includes(pageSize)) {