@cmstops/pro-compo 3.9.2 → 3.10.5-nanning.2

package/lib/contentModal/components/storeBox/index.js

@@ -68,8 +68,8 @@ const _sfc_main = vue.defineComponent({
                         icon: vue.withCtx(() => [
                           vue.createVNode(vue.unref(icon.IconCloseCircle), { size: "14" })
                         ]),
-                        _: 2
-                      }, 1032, ["onClick"])
+                        _: 1
+                      }, 8, ["onClick"])
                     ]);
                   }), 128))
                 ]),
@@ -81,9 +81,9 @@ const _sfc_main = vue.defineComponent({
                 type: "text",
                 onClick: clear
               }, {
-                default: vue.withCtx(() => _cache[1] || (_cache[1] = [
-                  vue.createTextVNode("\u6E05\u7A7A")
-                ])),
+                default: vue.withCtx(() => [..._cache[1] || (_cache[1] = [
+                  vue.createTextVNode("\u6E05\u7A7A", -1)
+                ])]),
                 _: 1
               })
             ])
@@ -97,9 +97,9 @@ const _sfc_main = vue.defineComponent({
                   key: 0,
                   class: "button"
                 }, {
-                  default: vue.withCtx(() => _cache[0] || (_cache[0] = [
-                    vue.createTextVNode("\u5DF2\u9009\u6570\u636E")
-                  ])),
+                  default: vue.withCtx(() => [..._cache[0] || (_cache[0] = [
+                    vue.createTextVNode("\u5DF2\u9009\u6570\u636E", -1)
+                  ])]),
                   _: 1
                 })) : vue.createCommentVNode("v-if", true)
               ]),

package/lib/dataTags/component.js

@@ -65,9 +65,9 @@ const _sfc_main = vue.defineComponent({
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
         vue.createCommentVNode(" \u539F\u521B/\u63A8\u8350/\u654F\u611F\u8BCD/\u5C01\u9762\u51E0\u56FE/ "),
-        _ctx.item ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1, [
-          _ctx.item.catalog === "doc" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-            _ctx.popverThumb && thumbList.value.length ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Popover), {
+        __props.item ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1, [
+          __props.item.catalog === "doc" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+            __props.popverThumb && thumbList.value.length ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Popover), {
               key: 0,
               "content-class": "doc-tags-thumb-popver",
               "arrow-class": "doc-tags-popver-arrow",
@@ -92,7 +92,7 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "thumb"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "thumb"])
                 }, {
                   default: vue.withCtx(() => [
                     vue.createTextVNode(vue.toDisplayString(thumbType.value), 1)
@@ -110,7 +110,7 @@ const _sfc_main = vue.defineComponent({
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(webVue.Tag), {
                     size: "small",
-                    class: vue.normalizeClass([{ disabled: _ctx.disabled }, "thumb"])
+                    class: vue.normalizeClass([{ disabled: __props.disabled }, "thumb"])
                   }, {
                     default: vue.withCtx(() => [
                       vue.createTextVNode(vue.toDisplayString(thumbType.value), 1)
@@ -121,7 +121,7 @@ const _sfc_main = vue.defineComponent({
                 _: 1
               }, 8, ["content"])) : vue.createCommentVNode("v-if", true)
             ], 64)),
-            _ctx.item.statement ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
+            __props.item.statement ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
               key: 2,
               content: "\u539F\u521B",
               position: "top"
@@ -129,17 +129,17 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "yuanchuang"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "yuanchuang"])
                 }, {
-                  default: vue.withCtx(() => _cache[1] || (_cache[1] = [
-                    vue.createTextVNode("\u539F\u521B")
-                  ])),
+                  default: vue.withCtx(() => [..._cache[1] || (_cache[1] = [
+                    vue.createTextVNode("\u539F\u521B", -1)
+                  ])]),
                   _: 1
                 }, 8, ["class"])
               ]),
               _: 1
             })) : vue.createCommentVNode("v-if", true),
-            _ctx.item.recommended ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
+            __props.item.recommended ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
               key: 3,
               content: "\u63A8\u8350",
               position: "top"
@@ -147,35 +147,35 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "star"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "star"])
                 }, {
-                  default: vue.withCtx(() => _cache[2] || (_cache[2] = [
-                    vue.createTextVNode("\u63A8\u8350")
-                  ])),
+                  default: vue.withCtx(() => [..._cache[2] || (_cache[2] = [
+                    vue.createTextVNode("\u63A8\u8350", -1)
+                  ])]),
                   _: 1
                 }, 8, ["class"])
               ]),
               _: 1
             })) : vue.createCommentVNode("v-if", true),
-            _ctx.item.sensitives ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
+            __props.item.sensitives ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
               key: 4,
-              content: `\u5305\u542B\u654F\u611F\u8BCD\uFF1A${_ctx.item.sensitives}`,
+              content: `\u5305\u542B\u654F\u611F\u8BCD\uFF1A${__props.item.sensitives}`,
               position: "top"
             }, {
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "waring"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "waring"])
                 }, {
-                  default: vue.withCtx(() => _cache[3] || (_cache[3] = [
-                    vue.createTextVNode("\u654F\u611F")
-                  ])),
+                  default: vue.withCtx(() => [..._cache[3] || (_cache[3] = [
+                    vue.createTextVNode("\u654F\u611F", -1)
+                  ])]),
                   _: 1
                 }, 8, ["class"])
               ]),
               _: 1
             }, 8, ["content"])) : vue.createCommentVNode("v-if", true),
-            _ctx.item.push_state === 3 ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
+            __props.item.push_state === 3 ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
               key: 5,
               content: "\u63A8\u9001\u6210\u529F",
               position: "top"
@@ -183,11 +183,11 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "star"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "star"])
                 }, {
-                  default: vue.withCtx(() => _cache[4] || (_cache[4] = [
-                    vue.createTextVNode("\u5DF2\u63A8\u9001")
-                  ])),
+                  default: vue.withCtx(() => [..._cache[4] || (_cache[4] = [
+                    vue.createTextVNode("\u5DF2\u63A8\u9001", -1)
+                  ])]),
                   _: 1
                 }, 8, ["class"])
               ]),
@@ -201,7 +201,7 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "star"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "star"])
                 }, {
                   default: vue.withCtx(() => [
                     vue.createTextVNode(vue.toDisplayString(localLiveType.value), 1)
@@ -211,7 +211,7 @@ const _sfc_main = vue.defineComponent({
               ]),
               _: 1
             }, 8, ["content"])) : vue.createCommentVNode("v-if", true),
-            _ctx.item.is_matrix ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
+            __props.item.is_matrix ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tooltip), {
               key: 7,
               content: "\u7A3F\u4EF6\u5B58\u5728\u81EA\u5A92\u4F53\u77E9\u9635\u5206\u53D1\u8BB0\u5F55",
               position: "top"
@@ -219,38 +219,38 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(webVue.Tag), {
                   size: "small",
-                  class: vue.normalizeClass([{ disabled: _ctx.disabled }, "matrix"])
+                  class: vue.normalizeClass([{ disabled: __props.disabled }, "matrix"])
                 }, {
-                  default: vue.withCtx(() => _cache[5] || (_cache[5] = [
-                    vue.createTextVNode(" \u77E9\u9635\u5206\u53D1 ")
-                  ])),
+                  default: vue.withCtx(() => [..._cache[5] || (_cache[5] = [
+                    vue.createTextVNode(" \u77E9\u9635\u5206\u53D1 ", -1)
+                  ])]),
                   _: 1
                 }, 8, ["class"])
               ]),
               _: 1
             })) : vue.createCommentVNode("v-if", true)
-          ], 64)) : _ctx.item.catalog === "kongo" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tag), {
+          ], 64)) : __props.item.catalog === "kongo" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tag), {
             key: 1,
             size: "small"
           }, {
             default: vue.withCtx(() => [
-              vue.createTextVNode(vue.toDisplayString(vue.unref(typeMap.kongo_source_map)[_ctx.item.series]), 1)
+              vue.createTextVNode(vue.toDisplayString(vue.unref(typeMap.kongo_source_map)[__props.item.series]), 1)
             ]),
             _: 1
-          })) : _ctx.item.catalog === "mp_account" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tag), {
+          })) : __props.item.catalog === "mp_account" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Tag), {
             key: 2,
             size: "small"
           }, {
             default: vue.withCtx(() => [
-              vue.createTextVNode(vue.toDisplayString(vue.unref(typeMap.mp_type_map)[_ctx.item.mp_type]), 1)
+              vue.createTextVNode(vue.toDisplayString(vue.unref(typeMap.mp_type_map)[__props.item.mp_type]), 1)
             ]),
             _: 1
-          })) : _ctx.item.catalog === "mp_content" ? (vue.openBlock(), vue.createBlock(component, {
+          })) : __props.item.catalog === "mp_content" ? (vue.openBlock(), vue.createBlock(component, {
             key: 3,
             class: "icon",
             type: "mpdoc"
           })) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 4 }, [
-            _ctx.item.list_type ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_4, vue.toDisplayString(vue.unref(typeMap.contentList_list_type_map)[_ctx.item.list_type]), 1)) : (vue.openBlock(), vue.createElementBlock("span", _hoisted_5, "--"))
+            __props.item.list_type ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_4, vue.toDisplayString(vue.unref(typeMap.contentList_list_type_map)[__props.item.list_type]), 1)) : (vue.openBlock(), vue.createElementBlock("span", _hoisted_5, "--"))
           ], 64))
         ])) : vue.createCommentVNode("v-if", true)
       ], 2112);

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,29 +70,38 @@ 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[__props.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",
             disabled: !vue.unref(current),
             onClick: handeRevert
           }, {
-            default: vue.withCtx(() => _cache[1] || (_cache[1] = [
-              vue.createTextVNode(" \u8FD8\u539F\u6B64\u7248\u672C ")
-            ])),
+            default: vue.withCtx(() => [..._cache[1] || (_cache[1] = [
+              vue.createTextVNode(" \u8FD8\u539F\u6B64\u7248\u672C ", -1)
+            ])]),
             _: 1
           }, 8, ["disabled"])
         ]),
@@ -124,7 +153,7 @@ const _sfc_main = vue.defineComponent({
           ])
         ]),
         _: 1
-      }, 8, ["visible"]);
+      }, 16, ["visible"]);
     };
   }
 });

package/lib/docHistory/components/DocDiffPanel/index.js

@@ -12,11 +12,11 @@ const _sfc_main = vue.defineComponent({
   setup(__props) {
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-        vue.createElementVNode("div", _hoisted_2, vue.toDisplayString(_ctx.doc.title), 1),
+        vue.createElementVNode("div", _hoisted_2, vue.toDisplayString(__props.doc.title), 1),
         vue.createElementVNode("div", _hoisted_3, [
           vue.createElementVNode("div", {
             class: "doc-content",
-            innerHTML: _ctx.doc.content
+            innerHTML: __props.doc.content
           }, null, 8, _hoisted_4)
         ])
       ]);

package/lib/docHistory/components/DocHistoryList/index.js

@@ -20,10 +20,10 @@ const _sfc_main = vue.defineComponent({
     const emits = __emit;
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.list, (item, idx) => {
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.list, (item, idx) => {
           return vue.openBlock(), vue.createElementBlock("div", {
             key: item,
-            class: vue.normalizeClass(["doc-history-item", { active: idx === _ctx.current }]),
+            class: vue.normalizeClass(["doc-history-item", { active: idx === __props.current }]),
             onClick: ($event) => emits("select", idx)
           }, [
             vue.createElementVNode("div", _hoisted_3, vue.toDisplayString(vue.unref(index.timeFormat)(item.update_time)), 1),

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/index.css

@@ -105,3 +105,7 @@
 .doc-history-drawer .arco-drawer-footer {
   text-align: left;
 }
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}

package/lib/docHistory/style/index.less

@@ -30,3 +30,8 @@
     text-align: left;
   }
 }
+
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}