@cmstops/pro-compo 3.9.0-beta.1 → 3.9.1-harbin.0

package/lib/contentModal/style/index.less

@@ -1,23 +1,23 @@
-@import './columnTree.less';
-@import './MediaFilter.less';
-@import './storeBox.less';
-@import './ViewAllColumn.less';
-
-.add-content-modal-wrapper {
-  .arco-modal-header {
-    border-bottom: none;
-  }
-}
-
-.add-content-modal-body {
-  height: 70vh;
-  padding: 0 !important;
-
-  .content-tabs {
-    height: 100%;
-  }
-
-  .arco-tabs-content {
-    padding-top: 0;
-  }
-}
+@import './columnTree.less';
+@import './MediaFilter.less';
+@import './storeBox.less';
+@import './ViewAllColumn.less';
+
+.add-content-modal-wrapper {
+  .arco-modal-header {
+    border-bottom: none;
+  }
+}
+
+.add-content-modal-body {
+  height: 70vh;
+  padding: 0 !important;
+
+  .content-tabs {
+    height: 100%;
+  }
+
+  .arco-tabs-content {
+    padding-top: 0;
+  }
+}

package/lib/contentModal/style/storeBox.less

@@ -1,55 +1,55 @@
-.selected-store-box-popover-content {
-  padding: 0;
-
-  .batch-section-popover-main {
-    .item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      box-sizing: border-box;
-      height: 42px;
-      padding: 5px 10px;
-
-      .icon {
-        display: inline-block;
-        width: 20px;
-        height: 25px;
-        margin-right: 8px;
-        font-size: 18px;
-        text-align: center;
-        vertical-align: middle;
-      }
-
-      .left {
-        display: inline-block;
-        align-items: center;
-        width: 90%;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-
-      .close-btn {
-        display: none;
-      }
-
-      &:hover,
-      &:active {
-        background-color: #f6f6f6;
-
-        .close-btn {
-          display: block;
-        }
-      }
-    }
-  }
-
-  .options {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    height: 42px;
-    border-top: 1px solid #f2f3f5;
-    //background-color: red;
-  }
-}
+.selected-store-box-popover-content {
+  padding: 0;
+
+  .batch-section-popover-main {
+    .item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      height: 42px;
+      padding: 5px 10px;
+
+      .icon {
+        display: inline-block;
+        width: 20px;
+        height: 25px;
+        margin-right: 8px;
+        font-size: 18px;
+        text-align: center;
+        vertical-align: middle;
+      }
+
+      .left {
+        display: inline-block;
+        align-items: center;
+        width: 90%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      .close-btn {
+        display: none;
+      }
+
+      &:hover,
+      &:active {
+        background-color: #f6f6f6;
+
+        .close-btn {
+          display: block;
+        }
+      }
+    }
+  }
+
+  .options {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    height: 42px;
+    border-top: 1px solid #f2f3f5;
+    //background-color: red;
+  }
+}

package/lib/dataTags/component.js

@@ -132,9 +132,10 @@ const _sfc_main = vue.defineComponent({
                   class: vue.normalizeClass([{ disabled: _ctx.disabled }, "yuanchuang"])
                 }, {
                   default: vue.withCtx(() => _cache[1] || (_cache[1] = [
-                    vue.createTextVNode("\u539F\u521B")
+                    vue.createTextVNode("\u539F\u521B", -1)
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [1]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -150,9 +151,10 @@ const _sfc_main = vue.defineComponent({
                   class: vue.normalizeClass([{ disabled: _ctx.disabled }, "star"])
                 }, {
                   default: vue.withCtx(() => _cache[2] || (_cache[2] = [
-                    vue.createTextVNode("\u63A8\u8350")
+                    vue.createTextVNode("\u63A8\u8350", -1)
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [2]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -168,9 +170,10 @@ const _sfc_main = vue.defineComponent({
                   class: vue.normalizeClass([{ disabled: _ctx.disabled }, "waring"])
                 }, {
                   default: vue.withCtx(() => _cache[3] || (_cache[3] = [
-                    vue.createTextVNode("\u654F\u611F")
+                    vue.createTextVNode("\u654F\u611F", -1)
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [3]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -186,9 +189,10 @@ const _sfc_main = vue.defineComponent({
                   class: vue.normalizeClass([{ disabled: _ctx.disabled }, "star"])
                 }, {
                   default: vue.withCtx(() => _cache[4] || (_cache[4] = [
-                    vue.createTextVNode("\u5DF2\u63A8\u9001")
+                    vue.createTextVNode("\u5DF2\u63A8\u9001", -1)
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [4]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -222,9 +226,10 @@ const _sfc_main = vue.defineComponent({
                   class: vue.normalizeClass([{ disabled: _ctx.disabled }, "matrix"])
                 }, {
                   default: vue.withCtx(() => _cache[5] || (_cache[5] = [
-                    vue.createTextVNode(" \u77E9\u9635\u5206\u53D1 ")
+                    vue.createTextVNode(" \u77E9\u9635\u5206\u53D1 ", -1)
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [5]
                 }, 8, ["class"])
               ]),
               _: 1

package/lib/dataTags/style/index.less

@@ -1,73 +1,73 @@
-.doc-tags-container {
-  .arco-tag {
-    margin-right: 5px;
-    font-weight: 600;
-    border: none;
-  }
-
-  .yuanchuang {
-    color: #4886ff;
-    background: #edf3ff;
-  }
-
-  .star {
-    color: #4a8457;
-    background: #e6f8ea;
-  }
-
-  .waring {
-    color: #ff7d00;
-    background: #fff2e6;
-  }
-
-  .thumb {
-    color: #86909c;
-    background: #f3f4f5;
-  }
-
-  .disabled {
-    color: #bababa !important;
-    background: #ecebeb !important;
-  }
-
-  .matrix {
-    color: #722ed1;
-    background-color: #f5e8ff;
-  }
-}
-
-.doc-tags-popver-arrow {
-  display: none;
-}
-
-.no-margin {
-  span {
-    margin-right: 0 !important;
-  }
-}
-
-.doc-tags-thumb-popver {
-  min-width: unset;
-  padding: 0;
-  overflow: hidden;
-  line-height: unset;
-  border: none;
-  border-radius: 8px;
-
-  .arco-popover-content {
-    margin-top: 0;
-  }
-
-  .doc-tags-thumb-ul {
-    // background: #000000;
-    height: 110px;
-
-    img {
-      height: 100%;
-    }
-
-    img + img {
-      margin-left: 2px;
-    }
-  }
-}
+.doc-tags-container {
+  .arco-tag {
+    margin-right: 5px;
+    font-weight: 600;
+    border: none;
+  }
+
+  .yuanchuang {
+    color: #4886ff;
+    background: #edf3ff;
+  }
+
+  .star {
+    color: #4a8457;
+    background: #e6f8ea;
+  }
+
+  .waring {
+    color: #ff7d00;
+    background: #fff2e6;
+  }
+
+  .thumb {
+    color: #86909c;
+    background: #f3f4f5;
+  }
+
+  .disabled {
+    color: #bababa !important;
+    background: #ecebeb !important;
+  }
+
+  .matrix {
+    color: #722ed1;
+    background-color: #f5e8ff;
+  }
+}
+
+.doc-tags-popver-arrow {
+  display: none;
+}
+
+.no-margin {
+  span {
+    margin-right: 0 !important;
+  }
+}
+
+.doc-tags-thumb-popver {
+  min-width: unset;
+  padding: 0;
+  overflow: hidden;
+  line-height: unset;
+  border: none;
+  border-radius: 8px;
+
+  .arco-popover-content {
+    margin-top: 0;
+  }
+
+  .doc-tags-thumb-ul {
+    // background: #000000;
+    height: 110px;
+
+    img {
+      height: 100%;
+    }
+
+    img + img {
+      margin-left: 2px;
+    }
+  }
+}

package/lib/docHistory/component.js

@@ -14,9 +14,11 @@ const _sfc_main = vue.defineComponent({
   __name: "component",
   props: {
     BASE_API: {},
+    wrap: { default: "drawer" },
     visible: { type: Boolean },
     docInfo: {},
-    pub: { type: Boolean }
+    pub: { type: Boolean },
+    currentIdx: {}
   },
   emits: ["update:visible", "select"],
   setup(__props, { emit: __emit }) {
@@ -28,6 +30,20 @@ const _sfc_main = vue.defineComponent({
         emits("update:visible", val);
       }
     });
+    const wrapProps = vue.computed(() => {
+      if (props.wrap === "drawer") {
+        return {
+          class: "doc-history-drawer-wrap",
+          title: "\u7248\u672C\u8BB0\u5F55",
+          width: 1e3
+        };
+      }
+      return {
+        bodyClass: "doc-history-modal-wrap",
+        title: "\u7248\u672C\u8BB0\u5F55",
+        width: 1e3
+      };
+    });
     const BASE_API = props.BASE_API || config.DEFAULT_BASE_API;
     const {
       initParams,
@@ -38,6 +54,10 @@ const _sfc_main = vue.defineComponent({
       list,
       current
     } = useDocHistory.useDocHistory(BASE_API);
+    const wrapComponent = {
+      drawer: webVue.Drawer,
+      modal: webVue.Modal
+    };
     function handeRevert() {
       emits("select", list.value[current.value]);
     }
@@ -50,20 +70,29 @@ const _sfc_main = vue.defineComponent({
       },
       { immediate: true }
     );
-    vue.onMounted(() => {
+    vue.watch(
+      () => props.currentIdx,
+      (val) => {
+        if (val) {
+          handleSelect(val);
+        }
+      },
+      { immediate: true }
+    );
+    vue.onMounted(async () => {
       if (!props.docInfo)
         return;
       initParams(props.docInfo.id, props.pub);
-      loadData();
+      await loadData();
+      if (props.currentIdx) {
+        handleSelect(props.currentIdx);
+      }
     });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(vue.unref(webVue.Drawer), {
+      return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(wrapComponent[_ctx.wrap]), vue.mergeProps({
         visible: vis.value,
-        "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => vis.value = $event),
-        class: "doc-history-drawer",
-        title: "\u7248\u672C\u8BB0\u5F55",
-        width: 1e3
-      }, {
+        "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => vis.value = $event)
+      }, wrapProps.value), {
         footer: vue.withCtx(() => [
           vue.createVNode(vue.unref(webVue.Button), {
             type: "primary",
@@ -71,9 +100,10 @@ const _sfc_main = vue.defineComponent({
             onClick: handeRevert
           }, {
             default: vue.withCtx(() => _cache[1] || (_cache[1] = [
-              vue.createTextVNode(" \u8FD8\u539F\u6B64\u7248\u672C ")
+              vue.createTextVNode(" \u8FD8\u539F\u6B64\u7248\u672C ", -1)
             ])),
-            _: 1
+            _: 1,
+            __: [1]
           }, 8, ["disabled"])
         ]),
         default: vue.withCtx(() => [
@@ -124,7 +154,7 @@ const _sfc_main = vue.defineComponent({
           ])
         ]),
         _: 1
-      }, 8, ["visible"]);
+      }, 16, ["visible"]);
     };
   }
 });

package/lib/docHistory/scripts/diff.js

@@ -40,15 +40,16 @@ function CompareText(v_LeftList, v_RightList, lftPNode = null) {
     for (let i = 0; i < rightLen; i++) {
       if (!rightFather)
         rightFather = v_RightList[i].parentNode;
-      const node = v_RightList[i].clone(true);
+      const node = v_RightList[i].cloneNode(true);
       try {
         rightFather.removeChild(v_RightList[i]);
       } catch (e) {
         console.log(e);
       }
-      if (lftPNode)
+      if (lftPNode && lftPNode.nodeType !== 3) {
         lftPNode.appendChild(node);
-      PaintRemove(node);
+        PaintRemove(node);
+      }
     }
   } else if (rightLen === 0) {
     for (let i = 0; i < leftLen; i++)

package/lib/docHistory/style/docDiffPanel.less

@@ -1,43 +1,43 @@
-.doc-diff-panel-wrap {
-  box-sizing: border-box;
-  width: 100% !important;
-  margin: 0;
-  margin-bottom: 0;
-  padding: 24px;
-  font-size: 17px;
-  line-height: 31px;
-  text-align: justify;
-
-  .doc-title {
-    color: var(--color-text-1);
-    font-weight: bold;
-    font-size: 24px;
-  }
-
-  .doc-content-wrap {
-    display: flex;
-
-    .doc-content {
-      margin: 0;
-      margin-bottom: 0;
-      font-size: 17px;
-      line-height: 31px;
-      text-align: justify;
-
-      img,
-      video {
-        display: block;
-        width: 100%;
-        max-width: 100% !important;
-        margin: 15px auto;
-      }
-
-      p {
-        margin-bottom: 10px !important;
-        font-size: 18px;
-        line-height: 30px !important;
-        text-indent: 2em !important;
-      }
-    }
-  }
-}
+.doc-diff-panel-wrap {
+  box-sizing: border-box;
+  width: 100% !important;
+  margin: 0;
+  margin-bottom: 0;
+  padding: 24px;
+  font-size: 17px;
+  line-height: 31px;
+  text-align: justify;
+
+  .doc-title {
+    color: var(--color-text-1);
+    font-weight: bold;
+    font-size: 24px;
+  }
+
+  .doc-content-wrap {
+    display: flex;
+
+    .doc-content {
+      margin: 0;
+      margin-bottom: 0;
+      font-size: 17px;
+      line-height: 31px;
+      text-align: justify;
+
+      img,
+      video {
+        display: block;
+        width: 100%;
+        max-width: 100% !important;
+        margin: 15px auto;
+      }
+
+      p {
+        margin-bottom: 10px !important;
+        font-size: 18px;
+        line-height: 30px !important;
+        text-indent: 2em !important;
+      }
+    }
+  }
+}