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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.26",
+  "version": "1.1.0-dev.28",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/Tinymce/index.vue

@@ -293,6 +293,9 @@ export default {
 };
 </script>
 
+<style lang="scss">
+@import "./mce-chrome.scss";
+</style>
 <style lang="scss" scoped>
 .tinymce-container {
   position: relative;

package/src/components/Tinymce/mce-chrome.scss

@@ -0,0 +1,150 @@
+// TinyMCE dialog chrome extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+
+.mce-container,
+.mce-container *,
+.mce-widget,
+.mce-widget *,
+.mce-reset {
+  font-size: $fontSizeBase !important;
+}
+.mce-window.mce-container {
+  border: none;
+  border-radius: 8px;
+  box-shadow: 0 0 24px rgba(0, 0, 0, 0.22);
+  font-size: $fontSizeBase;
+  .mce-window-head {
+    border: none;
+    .mce-title {
+      font-size: 13px !important;
+      font-weight: 400;
+    }
+    .mce-close i {
+      color: #464646;
+      font-family: "element-icons" !important;
+      font-size: 20px !important;
+      margin-right: 10px;
+      &::before {
+        content: "";
+      }
+    }
+  }
+  .mce-window-body {
+    background-color: #f1f5fb;
+    padding: 8px;
+    tap-highlight-color: transparent;
+    -webkit-tap-highlight-color: transparent;
+    -ms-tap-highlight-color: transparent;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    > .mce-container {
+      background-color: #fff;
+      position: relative;
+      height: 100% !important;
+      width: 100% !important;
+      overflow: hidden;
+      .mce-container-body {
+        margin-top: -4px;
+        .mce-container {
+          font-size: $fontSizeBase;
+        }
+        .mce-combobox input,
+        .mce-textbox,
+        .mce-btn {
+          border-radius: 2px;
+          border-color: #e8e8e8;
+          margin-left: -10px;
+        }
+        .mce-checkbox {
+          margin-left: -10px;
+          .mce-i-checkbox {
+            border-color: $borderColor;
+            border-radius: 2px;
+            text-align: center;
+          }
+        }
+        .mce-textbox.mce-multiline {
+          margin-top: -5px;
+        }
+        &.mce-abs-layout {
+          overflow: visible;
+        }
+      }
+      &.mce-panel {
+        .mce-tabs {
+          border-bottom-color: $borderColor;
+          .mce-tab {
+            border-color: $borderColor;
+            line-height: 15px;
+            &.mce-active {
+              color: $baseColor;
+              text-shadow: none;
+              background: #f1f5fb;
+            }
+          }
+        }
+        .mce-container-body {
+          margin-top: 0;
+          .mce-checkbox,
+          .mce-combobox input,
+          .mce-textbox,
+          .mce-btn {
+            margin-left: 0;
+          }
+        }
+      }
+    }
+  }
+  .mce-foot {
+    border-top: none;
+    background: none;
+    .mce-container-body {
+      padding: 0 14px 0 12px;
+      width: 100% !important;
+      tap-highlight-color: transparent;
+      -webkit-tap-highlight-color: transparent;
+      -ms-tap-highlight-color: transparent;
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+      box-sizing: border-box;
+      .mce-btn {
+        width: 94px !important;
+        height: 26px !important;
+        border-radius: 2px;
+        border-color: $baseColor;
+        margin-left: 9px;
+        position: relative !important;
+        left: inherit !important;
+        &.mce-primary {
+          background-color: $baseColor;
+          color: #fff;
+          button {
+            color: #fff;
+            .mce-txt:before {
+              content: "";
+            }
+          }
+        }
+        &.mce-disabled {
+          border-color: transparentize($baseColor, 0.6);
+        }
+        button {
+          font-size: $fontSizeBase;
+          line-height: 18px;
+          color: $baseColor;
+          .mce-txt:before {
+            content: "";
+            font-family: "element-icons";
+            margin-right: 4px;
+          }
+        }
+      }
+      .mce-abs-end + .mce-btn {
+        margin-left: 0;
+      }
+    }
+  }
+}

package/src/components/VabUpload/index.vue

@@ -28,7 +28,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/VabUpload/style.scss

@@ -0,0 +1,282 @@
+// Shared upload presentation for VabUpload, xform upload fields and compatible upload views.
+
+div[hideinfo="true"] #uploadImage {
+  &.widgetSize-1 .upload-list {
+    width: 67px !important;
+    height: 67px !important ;
+  }
+  &.widgetSize-2 .upload-list {
+    width: 98px !important;
+    height: 98px !important;
+  }
+  &.widgetSize-3 .upload-list {
+    width: 142px !important;
+    height: 142px !important;
+  }
+  &.widgetSize-4 .upload-list {
+    width: 180px !important;
+    height: 180px !important;
+  }
+  &.widgetSize-5 .upload-list {
+    width: 220px !important;
+    height: 220px !important;
+  }
+}
+#uploadImage {
+  &.widgetSize-1 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 58px;
+        width: 58px;
+        line-height: 58px;
+        margin-bottom: 5px;
+      }
+    }
+    .el-upload-list .el-upload-list__item {
+      height: 58px;
+      padding-left: 54px;
+      width: 240px;
+      .el-upload-list__item-thumbnail {
+        width: 54px;
+        height: 54px;
+        margin-left: -54px;
+        .show-video {
+          line-height: 46px;
+          i {
+            margin: 0;
+          }
+        }
+        p {
+          width: 54px;
+          height: 54px;
+          img {
+            max-width: 54px;
+            max-height: 54px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          &:first-child {
+            -webkit-line-clamp: 1;
+            margin-top: 3px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-2 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 100px;
+        width: 100px;
+        line-height: 100px;
+        margin-bottom: 3px;
+      }
+    }
+    //.upload-list{height:98px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 100px;
+      padding-left: 98px;
+      width: 298px;
+      .el-upload-list__item-thumbnail {
+        width: 98px;
+        height: 98px;
+        margin-left: -98px;
+        .show-video {
+          line-height: 98px;
+        }
+        p {
+          width: 88px;
+          height: 88px;
+          img {
+            max-width: 88px;
+            max-height: 88px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 4px;
+          &:first-child {
+            max-height: 32px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-3 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 135px;
+        width: 135px;
+        line-height: 135px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:142px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 135px;
+      padding-left: 135px;
+      width: 298px;
+      .el-upload-list__item-thumbnail {
+        width: 130px;
+        height: 130px;
+        margin-left: -135px;
+        .show-video {
+          line-height: 130px;
+        }
+        p {
+          width: 130px;
+          height: 130px;
+          img {
+            max-width: 130px;
+            max-height: 130px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 4px;
+          &:first-child {
+            max-height: 32px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-4 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 175px;
+        width: 175px;
+        line-height: 175px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:180px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 175px;
+      padding-left: 175px;
+      width: 356px;
+      .el-upload-list__item-thumbnail {
+        width: 175px;
+        height: 175px;
+        margin-left: -175px;
+        .show-video {
+          line-height: 175px;
+        }
+        p {
+          width: 170px;
+          height: 170px;
+          img {
+            max-width: 170px;
+            max-height: 170px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 5px;
+          &:first-child {
+            -webkit-line-clamp: 3;
+            max-height: 52px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-5 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 215px;
+        width: 215px;
+        line-height: 215px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:220px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 215px;
+      padding-left: 215px;
+      width: 418px;
+      .el-upload-list__item-thumbnail {
+        width: 213px;
+        height: 213px;
+        margin-left: -215px;
+        .show-video {
+          line-height: 213px;
+        }
+        p {
+          width: 208px;
+          height: 208px;
+          img {
+            max-width: 208px;
+            max-height: 208px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 8px;
+          &:first-child {
+            -webkit-line-clamp: 4;
+            max-height: 68px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-6 {
+    .el-upload {
+      // margin-top:5px;
+      .avatar-uploader {
+        height: 245px;
+        width: 245px;
+        line-height: 245px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:245px;}
+    .el-upload-list .el-upload-list__item {
+      height: 245px;
+      padding-left: 245px;
+      width: 468px;
+      .el-upload-list__item-thumbnail {
+        width: 242px;
+        height: 242px;
+        margin-left: -245px;
+        .show-video {
+          line-height: 242px;
+        }
+        p {
+          width: 225px;
+          height: 225px;
+          img {
+            max-width: 225px;
+            max-height: 225px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 8px;
+          &:first-child {
+            -webkit-line-clamp: 4;
+            max-height: 68px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+}

package/src/components/baseArea/index.vue

@@ -1322,7 +1322,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/variables.scss";
+@import "~@base/styles/variables.scss";
 
 .base-area {
   width: 100%;
@@ -1593,7 +1593,7 @@ export default {
 </style>
 
 <style lang="scss">
-@import "~@/styles/variables.scss";
+@import "~@base/styles/variables.scss";
 
 /* el-popover 根节点为 inline span，需强制块级铺满 */
 .base-area {

package/src/components/code-editor/ace-chrome.scss

@@ -0,0 +1,17 @@
+// Ace editor chrome extracted from the app stylesheet.
+.ace-editor {
+  border: solid 1px #e8e8e8;
+  border-radius: 2px;
+}
+.ace-sqlserver .ace_print-margin {
+  display: none;
+}
+
+.ns-resize-ing {
+  cursor: ns-resize !important;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  -khtml-user-select: none;
+  user-select: none;
+}

package/src/components/code-editor/index.vue

@@ -311,6 +311,9 @@ export default {
 };
 </script>
 
+<style lang="scss">
+@import "./ace-chrome.scss";
+</style>
 <style lang="scss" scoped>
 #editor-resize-bar {
   width: 100%;

package/src/components/excelImport/index.vue

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