Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online

public/pptworker/pptJson.js

@@ -57979,7 +57979,7 @@
                               case 0:
                                  return (n = t[r]), (e.next = 3), n.async("string")
                               case 3:
-                                 return (i = e.sent), (o = Ir(i, Fr)), (a = o.presentation.defaultTextStyle.lvl1pPr), e.abrupt("return", a)
+                                 return (i = e.sent), (o = Ir(i, Fr)), (a = o.presentation.defaultTextStyle?.lvl1pPr), e.abrupt("return", a)
                               case 7:
                               case "end":
                                  return e.stop()
@@ -58311,7 +58311,7 @@
                         void 0 === b ||
                         null === (w = b.lstStyle) ||
                         void 0 === w ||
-                        null === (x = w.lvl1pPr) ||
+                        null === (x = w?.lvl1pPr) ||
                         void 0 === x ||
                         null === (A = x.defRPr) ||
                         void 0 === A ||
@@ -58321,7 +58321,7 @@
                            : _.sz) ||
                         (null === m ||
                         void 0 === m ||
-                        null === (T = m.txBody.lstStyle.lvl1pPr.defRPr) ||
+                        null === (T = m.txBody.lstStyle?.lvl1pPr?.defRPr) ||
                         void 0 === T ||
                         null === (E = T.attributes) ||
                         void 0 === E
@@ -58482,10 +58482,10 @@
                   "ctr" === t.attributes.algn ? (a = "text-align:center;") : "r" === t.attributes.algn && (a = "text-align:right;")
                else if (r) {
                   var s, l
-                  null !== r && void 0 !== r && null !== (s = r.lvl1pPr) && void 0 !== s && null !== (l = s.attributes) && void 0 !== l && l.algn
-                     ? "ctr" === r.lvl1pPr.attributes.algn
+                  null !== r && void 0 !== r && null !== (s = r?.lvl1pPr) && void 0 !== s && null !== (l = s.attributes) && void 0 !== l && l.algn
+                     ? "ctr" === r?.lvl1pPr?.attributes.algn
                         ? (a = "text-align:center;")
-                        : "r" === r.lvl1pPr.attributes.algn && (a = "text-align:right;")
+                        : "r" === r?.lvl1pPr?.attributes.algn && (a = "text-align:right;")
                      : null !== r && void 0 !== r && r.type && (r.type.includes("title") || r.type.includes("Title")) && (a = "text-align:center;")
                }
                return a
@@ -59116,11 +59116,11 @@
             })(),
             $r = function (e, t, r) {
                var n, i, o, a, s, l, c
-               if ("title" === t && null !== (n = e.sldMaster.txStyles) && void 0 !== n && null !== (i = n.titleStyle) && void 0 !== i && i.lvl1pPr)
+               if ("title" === t && null !== (n = e.sldMaster.txStyles) && void 0 !== n && null !== (i = n.titleStyle) && void 0 !== i && i?.lvl1pPr)
                   c = {
                      txBody: {
                         lstStyle: {
-                           lvl1pPr: e.sldMaster.txStyles.titleStyle.lvl1pPr
+                           lvl1pPr: e.sldMaster.txStyles.titleStyle?.lvl1pPr
                         }
                      }
                   }
@@ -59130,16 +59130,16 @@
                   void 0 !== o &&
                   null !== (a = o.bodyStyle) &&
                   void 0 !== a &&
-                  a.lvl1pPr
+                  a?.lvl1pPr
                )
                   c = {
                      txBody: {
                         lstStyle: {
-                           lvl1pPr: e.sldMaster.txStyles.bodyStyle.lvl1pPr
+                           lvl1pPr: e.sldMaster.txStyles.bodyStyle?.lvl1pPr
                         }
                      }
                   }
-               else if (r || (null !== (s = e.sldMaster.txStyles) && void 0 !== s && null !== (l = s.otherStyle) && void 0 !== l && l.lvl1pPr)) {
+               else if (r || (null !== (s = e.sldMaster.txStyles) && void 0 !== s && null !== (l = s.otherStyle) && void 0 !== l && l?.lvl1pPr)) {
                   var u
                   ;(u = r
                      ? {
@@ -59149,7 +59149,7 @@
                              }
                           }
                        }
-                     : e.sldMaster.txStyles.otherStyle.lvl1pPr),
+                     : e.sldMaster.txStyles.otherStyle?.lvl1pPr),
                      (c = {
                         txBody: {
                            lstStyle: {
@@ -62174,13 +62174,13 @@
                                  (D in ["Sans-serif", "Serif"] || (D = "Sans-serif"), !M.includes("font-size")) &&
                                  null !== p &&
                                  void 0 !== p &&
-                                 null !== (O = p.txBody.lstStyle.lvl1pPr.defRPr) &&
+                                 null !== (O = p.txBody.lstStyle?.lvl1pPr?.defRPr) &&
                                  void 0 !== O &&
                                  null !== (j = O.attributes) &&
                                  void 0 !== j &&
                                  j.sz
                               ) {
-                                 var B = (((null === p || void 0 === p ? void 0 : p.txBody.lstStyle.lvl1pPr.defRPr.attributes.sz) / 100) * 4) / 3
+                                 var B = (((null === p || void 0 === p ? void 0 : p.txBody.lstStyle?.lvl1pPr?.defRPr.attributes.sz) / 100) * 4) / 3
                                  1 !== d && (B = Math.round(B / d)), (M = "".concat(M, "font-size:").concat(B, "px;vertical-align:top;"))
                               }
                               var F = '<span style="font-family:'.concat(D, '"><span style="').concat(M, '">').concat(I, "</span></span>")
@@ -62218,7 +62218,7 @@
                            void 0 === i ||
                            null === (o = i.lstStyle) ||
                            void 0 === o ||
-                           null === (a = o.lvl1pPr) ||
+                           null === (a = o?.lvl1pPr) ||
                            void 0 === a ||
                            !a.buChar)) ||
                      (null !== e && void 0 !== e && null !== (s = e.pPr) && void 0 !== s && s.buNone)
@@ -62237,7 +62237,7 @@
                      void 0 !== f &&
                      null !== (p = f.lstStyle) &&
                      void 0 !== p &&
-                     null !== (d = p.lvl1pPr) &&
+                     null !== (d = p?.lvl1pPr) &&
                      void 0 !== d &&
                      d.buChar
                   )
@@ -62326,7 +62326,7 @@
                                        null === (u = c.lstStyle) ||
                                        void 0 === u
                                           ? void 0
-                                          : u.lvl1pPr),
+                                          : u?.lvl1pPr),
                                     d && (p.lstStyle = d),
                                     (h = t.txBody.p),
                                     Array.isArray(h) || (h = [h]),
@@ -62577,7 +62577,7 @@
                                                 void 0 !== c &&
                                                 null !== (u = c.lstStyle) &&
                                                 void 0 !== u &&
-                                                null !== (d = u.lvl1pPr) &&
+                                                null !== (d = u?.lvl1pPr) &&
                                                 void 0 !== d &&
                                                 d.buChar)) &&
                                           (null === F || void 0 === F || null === (h = F.pPr) || void 0 === h || !h.buNone) &&
@@ -62611,7 +62611,7 @@
                                                void 0 !== _ &&
                                                null !== (T = _.lstStyle) &&
                                                void 0 !== T &&
-                                               T.lvl1pPr
+                                               T?.lvl1pPr
                                              ? null === (S = m) || void 0 === S || null === (C = S.txBody) || void 0 === C
                                                 ? void 0
                                                 : C.lstStyle
@@ -62635,7 +62635,7 @@
                                              void 0 !== I &&
                                              null !== (N = I.lstStyle) &&
                                              void 0 !== N &&
-                                             null !== (M = N.lvl1pPr) &&
+                                             null !== (M = N?.lvl1pPr) &&
                                              void 0 !== M &&
                                              M.buChar)
                                        ) ||
@@ -62669,7 +62669,7 @@
                                             void 0 !== ce &&
                                             null !== (ue = ce.lstStyle) &&
                                             void 0 !== ue &&
-                                            ue.lvl1pPr
+                                            ue?.lvl1pPr
                                           ? null === (fe = m) || void 0 === fe || null === (pe = fe.txBody) || void 0 === pe
                                              ? void 0
                                              : pe.lstStyle