cloud-web-corejs 1.0.54-dev.658 → 1.0.54-dev.659

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.658",
+  "version": "1.0.54-dev.659",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/bd/setting/formVersion/compareBasicSection.vue

@@ -68,3 +68,53 @@ export default {
   },
 };
 </script>
+
+<style scoped lang="scss">
+@import "./compareContMixin.scss";
+
+.compare-cont {
+  @include compare-cont-shell;
+  @include compare-cont-title;
+  @include compare-version-label;
+}
+
+.table-border_1 {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+
+  th,
+  td {
+    padding: 10px 12px;
+    border: 1px solid #ebeef5;
+    font-size: 13px;
+    line-height: 20px;
+    vertical-align: middle;
+    word-break: break-all;
+  }
+
+  th {
+    width: 160px;
+    background: #f5f7fa;
+    color: #606266;
+    font-weight: 500;
+    text-align: left;
+  }
+
+  td {
+    width: calc((100% - 160px) / 2);
+    color: #303133;
+
+    .compare-revert-btn {
+      float: right;
+    }
+  }
+
+  tr.id-difference {
+    td {
+      background: #fef0f0;
+      color: #f56c6c;
+    }
+  }
+}
+</style>

package/src/views/bd/setting/formVersion/compareCodeSection.vue

@@ -343,7 +343,20 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import "./compareContMixin.scss";
+
 .compare-code-section {
+  @include compare-cont-shell;
+  @include compare-cont-full-link;
+  @include compare-version-label;
+  @include compare-flex-row;
+
+  .compare-code-flex {
+    ::v-deep .ace-container {
+      border: 1px solid #ebeef5;
+    }
+  }
+
   .compare-code-header {
     position: relative;
     min-height: 28px;

package/src/views/bd/setting/formVersion/compareContMixin.scss

@@ -0,0 +1,55 @@
+@mixin compare-cont-shell {
+  position: relative;
+  margin: 12px 16px;
+  padding: 12px 16px 16px;
+  background: #fff;
+  border-radius: 4px;
+}
+
+@mixin compare-cont-title {
+  .title {
+    margin-bottom: 12px;
+    font-size: 14px;
+    color: #303133;
+  }
+}
+
+@mixin compare-cont-full-link {
+  .is-full {
+    position: absolute;
+    top: 12px;
+    right: 16px;
+    font-size: 16px;
+    color: #409eff;
+  }
+}
+
+@mixin compare-version-label {
+  .version-blue,
+  .version-green {
+    display: inline-block;
+    margin-bottom: 8px;
+    font-size: 13px;
+    font-weight: 600;
+  }
+
+  .version-blue {
+    color: #409eff;
+  }
+
+  .version-green {
+    color: #67c23a;
+  }
+}
+
+@mixin compare-flex-row {
+  .flex {
+    display: flex;
+    gap: 12px;
+
+    .flex-1 {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+}

package/src/views/bd/setting/formVersion/compareDialog.vue

@@ -86,118 +86,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss">
-.form-version-compare-dialog {
-  .compare-cont {
-    position: relative;
-    margin: 12px 16px;
-    padding: 12px 16px 16px;
-    background: #fff;
-    border-radius: 4px;
-
-    .title {
-      margin-bottom: 12px;
-      font-size: 14px;
-      color: #303133;
-    }
-
-    .is-full {
-      position: absolute;
-      top: 12px;
-      right: 16px;
-      font-size: 16px;
-      color: #409eff;
-    }
-
-    .version-blue,
-    .version-green {
-      display: inline-block;
-      margin-bottom: 8px;
-      font-size: 13px;
-      font-weight: 600;
-    }
-
-    .version-blue {
-      color: #409eff;
-    }
-
-    .version-green {
-      color: #67c23a;
-    }
-
-    .flex {
-      display: flex;
-      gap: 12px;
-
-      .flex-1 {
-        flex: 1;
-        min-width: 0;
-      }
-    }
-
-    &.is-section-fullscreen:not(.compare-code-section):not(.compare-detail-section) {
-      position: fixed;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      z-index: 9999;
-      margin: 0;
-      overflow: auto;
-    }
-  }
-
-  .table-border_1 {
-    width: 100%;
-    border-collapse: collapse;
-    table-layout: fixed;
-
-    th,
-    td {
-      padding: 10px 12px;
-      border: 1px solid #ebeef5;
-      font-size: 13px;
-      line-height: 20px;
-      vertical-align: middle;
-      word-break: break-all;
-    }
-
-    th {
-      width: 160px;
-      background: #f5f7fa;
-      color: #606266;
-      font-weight: 500;
-      text-align: left;
-    }
-
-    td {
-      width: calc((100% - 160px) / 2);
-      color: #303133;
-
-      .compare-revert-btn {
-        float: right;
-      }
-    }
-
-    tr.id-difference {
-      td {
-        background: #fef0f0;
-        color: #f56c6c;
-      }
-    }
-  }
-
-  .compare-code-flex .ace-container {
-    border: 1px solid #ebeef5;
-  }
-
-  .compare-detail-grid {
-    margin-top: 8px;
-
-    .grid-height {
-      height: 320px !important;
-    }
-  }
-}
-</style>

package/src/views/bd/setting/formVersion/preformDialog.vue

@@ -78,9 +78,10 @@ export default {
   },
 };
 </script>
-<style scoped></style>
-<style>
-.formVersion-preform-dialog .el-dialog__header {
-  text-align: left;
+<style scoped lang="scss">
+::v-deep .formVersion-preform-dialog {
+  .el-dialog__header {
+    text-align: left;
+  }
 }
 </style>

package/src/views/bd/setting/formVersion/tableModelCompareView.vue

@@ -329,7 +329,21 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import "./compareContMixin.scss";
+
 .compare-detail-section {
+  @include compare-cont-shell;
+  @include compare-cont-full-link;
+  @include compare-version-label;
+
+  .compare-detail-grid {
+    margin-top: 8px;
+
+    .grid-height {
+      height: 320px !important;
+    }
+  }
+
   .compare-detail-header {
     position: relative;
     min-height: 28px;