From 8c8d2799d689ba46f6dabcdb58f5cb143c8f7f1d Mon Sep 17 00:00:00 2001
From: "liujuping.liujupin" <liujuping.liujupin@alibaba-inc.com>
Date: Mon, 8 Nov 2021 10:20:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20leaf=20propschange?=
 =?UTF-8?q?=20=E9=80=BB=E8=BE=91=20&=20=E4=BF=AE=E5=A4=8D=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=20public=20=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ignitor/public/favicon.png     | Bin 0 -> 3612 bytes
 packages/ignitor/public/index.html      |  87 ++++++++++++++++++++++++
 packages/ignitor/public/preview.html    |  22 ++++++
 packages/renderer-core/src/hoc/leaf.tsx |   7 +-
 4 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 packages/ignitor/public/favicon.png
 create mode 100644 packages/ignitor/public/index.html
 create mode 100644 packages/ignitor/public/preview.html

diff --git a/packages/ignitor/public/favicon.png b/packages/ignitor/public/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..307ffbd82dba398d6db6459102bff331eef7df6b
GIT binary patch
literal 3612
zcmV+%4&(8OP)<h;3K|Lk000e1NJLTq003G5003GD1^@s6IH*Aa00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91TA%{}1ONa40RR91S^xk507-m{w*UYQhDk(0RCodHT?>#D#Towp*}H|i
z+dTn!mde8i1wu-BR8XSvS)#mzvO>hDgg^x>qli)9_Kq+LcPJ3Bu+SK-ynID85>dgJ
zf)ItMP%%POG)f4F%3HbJz2lbM?R>q<9(%hpvoo`^$1F!z?agfW|Ns5>H@$y%|NT!N
z)9I8O0kys}9V_WeB7QCjaV`-)%ss()2JZ3U%EY}OCKh25^exJF;@jsa+eD=m&vNcs
z+8Bi@I#8tHdjNF^fEtX}4+gmB<b?uzrj+C*;8b8<D$3|^_;U2ZYXI)m6bVUSl|<8o
zLk;BkC2g}uKP>!oBs2;z-h|Ic09)=5q&i}FecJ(A2&TE=5fm5G(0gxyZEdH6iu2h_
zJ5PO}Rndte;mJhtI{@%`&ZB5b;y0%*&~w8>C>pyHqyEk4y=A80C>Rkpo_d2}APn0Z
z`vpM$ZW1@AMzs8%!l?uF-0&cZ#+Q(YU7a5!1>j~nT>L<*4QEp%S__bGgNbmbDHL?D
zc!5q%(PmRq>|XRi*kE^<2+iLE7c0;;;j#2>=t+RvRkLC4%RE$EJ$gCjzI#K9DHglS
zeOMZ5R79pjJ=zx_zkpTT#fD9CW1*mZ$u+$jl}p#DIy8xzBJUR^$g&*@ZFlD=odQ`E
zK8ge%$2fOuDyulJJixs`2f{tzO<Rir@1o)aH>EWnqjtV>cMgWq9ydk)0#$pb)OGC2
zyd5S;I^_@Jm(l@C^gfV%VZr9$OrMg<QTG8|9Ue-NW9Z4$*)ed5_hQFm39<4=sxALA
zORn13lbVi6^E3+|?3g&11brl>xyy6}LKnkatcPA59cwD{W7OGqAKlB1Ib~J_y8w|V
z(BsGFq%}`aO$#gQ+ynI7-~fuz1~k&So~-aRs`dZcJSL!&e(UPcGF)d^;?pO-3_x#k
z&U92aoJAbJ4vzIcP_j3Es=aY-kL$P40h^Wh2!VU$OZ3`ZRN~o1W#zjmz=tRh9t>Z_
z>u9BOATvK;8Dt3-vw)s60d`MZ^Xu76A?oGdoDeJj*iI_;)*=lf;8d5p7NY@_$GR+x
z$|Opy^BHmQR*dw6F$l$ts0_<gQAtgq&!C(AWj@nds;e9+>#@IJscGzkIqrLKORm9_
zztJAZQU#|$hDhewd4Vj|Qn?=J)XH1ii4{5CB$7R#tLn#5{1{ehG&Cj1HCN`ZskY)x
zNAxN6{RU61$+j$o*QI!^104v>1oNuo95f}yRoB%CJL`l>Du*EE@3urSA0SWp))cQb
zpaUV;W3eQ~?9yvu-s+fcEdFg%)=TN;%RJEP(ep7|cpmoHJdaHc^I{X?i@f-=n3a85
zS!ObXcs`xX9B8WWV&(KQ7(1pjyYk-Su|Lz$YLKuK|G|5x&c88ToH?K)p(>b+@1!%j
z_FlxhJE|Mg*_P$8cp-C~$PIK&us<paSg!13F$git;i|36^LSdA4XKYY&~iB%7f-=1
zdmUE3fZ})zslu5RuiDrfZMV3i!ynQ7ihpJ{&=}~NkPM?5p2_6u??QCJif)P{I!2;$
zhuvZl%d{Buok}uZqAB_@nEYCduFhlLM?T+xgdfGOqE+?%uvpn<Y2_;G?e6PEcV{nh
z^m}wubVX5uEP)lG8wEp{$J#U@4<U-5d6gxQlMi%-7Ra(l8|dob4^TEX$y=;{#g*{I
z{25^TEVV!lcBT5D^xvRITS@SDd&T2=9N9oG6dhrgAJt<hs(eAC5W)WrRo7o;O7EKR
zNNS=jw#Fr<-;-K-P_Lfs(K#4IpdfYAV<@_OAqJv7Z&OwMYozcq<oCTnbNEPeJER{y
z9vul&aXSKY%sr51=F|;**xpjjL9m%3b(6RTf>+@u)9l)7QFbbQk(&@iM-USUU$Y~z
z(@$d;<#r>8PM8k)(u@$+wtb8wySYs6ehcd55XeDd&+J^yJpuH=@H`NopNrvic?JTk
z%%{4FuQPJ9z9#3<a`%}81_7JXp)9d&CgVTU+dq(|$?Z7fq|i$2^NGYVJ9}U><~?2N
zQD&F{Spucd2jL%~HxD_DnneVdUZn+?!I(_2(c-5jX-|`-5MaW_ZRw2ES2I@$^hIU}
zPt&9!Ab1KbDBGEqlk--=G$*Ga&ncx%5%6+a=zqy-ljZbolU1fROV6|!fjRfvX}^Nu
z@L{+EUHnRuon{q;=NsbE3E0_=*pZG{oXU-`)6=llkJ=H?Hh9nx70)E9E!$<cy(b+1
zHAgR?cw`!Sw~RjO2HV{Mfr(hEB2cldC#E@wp~ElVemViPo{YpRXW<T{lmPg62a4fC
zaHYzJ5XWgPtjO>9Bm&2;z=LrvB2-VO*34&C5jyZdzE$Q1+DZ*F{8q%WHYTlza1|{p
z3#rcMNCdzMr;-yb^p<}J(-U(-)Jd1Yw9F}xWm}vDT8_vpcAs>R@>M{-j!{=>V+UNn
zVrPL))WiSMudWD6n4hCs-_M-Zv;aWkJ(QwNa!bm0M`k#e6V0&<w4kaB@fjva)s9~B
zmcCxJ3m~S(M5MnH$Y#heJ?j9l@K=YP0{^6>4E`?wy@F}co(!2pRl&bu%6DZ}elcXU
z^H%`u2B%du)uRQi#7jV-XHofakfj=lqa){QDx`?zn)$_$8ExuO2sLv8odkKy)2Muc
zh61+;3S=u*Te%7gns+tm-Jc~Q+3j&aYeS%6E>OPZcj&znwd;~mrcoSurjb0#beNV#
zjS_cf#o5{T>f^1|1v&|G__qN0R%2wubU{nYvS{Y}wjy8!zLO$LOs&_W@#-iBNjdNd
z!=R8PgyKx1y^}TJto1#OsgewqES|*FIz2iG@+=uhqYa)GWL@?y6rHA?tyM(5eDZa<
z)tY5)%#4e|_vqswBO+2vHHATkZ-{QjI63hTl{9Gc22CCr^HAp>2Q%_uQOvKIr6<zy
zlwqT1{Tv{hv#Y&#CPD7HFR9dkZRd%hSNu{_L-`_mt$!XVc!^!^AiFt<!UWzo11)HI
zJAgdT6b5~_6OCR)<jvUCxp>P=(QnL6x-x1jUm>r*5A3!InnSvDC$&IC3sHSD&_svj
zDiL7kND|}`YvA{bXA_n;Fb)03O40qti8uPQ36P`m;e;c-lfM@>4ekNxZ@Ft4h+{1Z
zkR-UxNzkkXI1-||IV1Dtyw7lcIL0+t0>iZDoEWVeGm?)y_NF0Ss_+S%aImLwFm`W-
z<L%r*sNgF6y0iz^6i=b9@|=%4zv{I344~ywd&?wLay=S~|HQ!XZzQ&<hR|7XX^eZ3
z$Yav4|MgjMdUJGuj{Ito{8tW^6i=R&u@`k`&(AFhvO&zA(TEO(W6asq0%$GKg64Fj
zGY%f6A3j6W{-_p-e%=AZd9NA!4jt)y3)4gY(<js@2?RgJ{$qcQl0s&Msgu7O-OpjC
zD@n7_I-=V*j7^ves~}5pUG~eF$)(h9>vlo+-HX+xPp1~GY%sTSVjPcA0FY%XasxeJ
z+g%C3?6$dG6VY{R+ta|UnEHkH2)ci<pxHf5h&y0{#yJwku|R?sIw!EDBtxJRJ+S|W
z7@YD<5lm)woeLrIzwn6rFyQXMz`IP);tB)F2Mx*!QS>BY>OL-nU?~%Wok1G@Miq5B
zX!tM;xRXV3u)lsIQP7`8D&!!057B-MzI1n5!HHWOZjB(G)=BcT#g0BK)(V%5f$q6;
zN?uh<kk^hO`a;iAh!F<zTgP<BGnl-kqYGu5Q|;63t>U&G{i*9dOdD*b1ju;#cE<$<
z0&o(5UJ~32rh|9mS92|??LXI3!>N2-psAr`9xBN>{nJ$BSSisfSc&gAU$gjlCVU?4
z^nb1jOh-WzZ-Drrg|y4*>g$`1PKQRN6PmscV+Qx?c$nXA1}q$ejlP~~!A@NwdCFEn
z5>6gaxCa0FZYkUW8h(U=RH{7~iaSfbPo4%KW-;xD&-^tEe4+G#FH1%UIX5sZc_*tR
zJtJNK)4}{cdFXbU@6$I~={h)guWdTQzH2Sj!4xH-JVGx{jO73sD=r?%w0Kia`Dd0n
zXF6o;xAb9neZy$JztusOZPf<a*YHVBAn<>ZV8PepGabK+9{gy0CdE9B`g}50qGU8c
zep{a=tt5F2F&<2wNgmA2%B2ZM5f04GQ<`mdZ5!P=@-pr7?xNC2uNIPV!V<o}1#nja
z+&|&y>&#`cUPJHzcr5%K8(PTA^(8r%Hd@r^OOPu)!m&GEUkz-rMJJ8ESi2>fK*KG6
zRLqJD$JrH+K=37)0&Pd%UrnU|cQL`MrkCJrPI~*&2xKGqMnp8NOUpEOo0#H>mJizu
zC-Wz8NKKXJHk%=D4H`|LWyQRRzQSdKMJ3jP{?0TWI67!NK>ll5p7~oAU*RDSG0l*$
z#k7dJ`5x3ea>ukRhY59owpUNZ985VX!Fvln*d<UV1LSw@$&y_B9)2NMTAE2RT$q1?
zklPQ;P`5UXy#+}QE#ZvvGN~CGiaD6Hij)5$WCy_3-vD4~n#6<Hi(Cv_tT#qzNpID>
zf&lGk3j)CjFdxqWOzD7XnV2`?o$RT!p#7&U3*7h3{Xk31<i89N@fv`AIldv@kEMB7
i0W*<x2B;)=WBNbAZP=RGv^22*0000<MNUMnLSTaW$Gyt{

literal 0
HcmV?d00001

diff --git a/packages/ignitor/public/index.html b/packages/ignitor/public/index.html
new file mode 100644
index 000000000..1d64096b5
--- /dev/null
+++ b/packages/ignitor/public/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width" />
+    <title>LowCodeEngine Editor DEMO</title>
+    <link rel="shortcut icon" href="./favicon.png" />
+    <link rel="stylesheet"  data-name="vs/editor/editor.main" href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.css"/>
+    <script src="https://g.alicdn.com/code/lib/react/16.9.0/umd/react.development.js"></script>
+    <script src="https://g.alicdn.com/code/lib/react-dom/16.9.0/umd/react-dom.development.js"></script>
+    <script src="https://g.alicdn.com/code/lib/prop-types/15.7.2/prop-types.js"></script>
+    <script>
+      React.PropTypes = PropTypes;
+    </script>
+    <script src="https://g.alicdn.com/platform/c/??react15-polyfill/0.0.1/dist/index.js,lodash/4.6.1/lodash.min.js,immutable/3.7.6/dist/immutable.min.js,natty-storage/2.0.2/dist/natty-storage.min.js,natty-fetch/2.6.0/dist/natty-fetch.pc.min.js,tinymce/4.2.5/tinymce-full.js"></script>
+    <script src="https://g.alicdn.com/mylib/moment/2.24.0/min/moment.min.js"></script>
+    <link rel="stylesheet" href="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.css" />
+    <script src="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/rax@1.1.3/dist/rax.js"></script>
+    <!-- <script src="http://192.168.0.106:8000/lc-engine.js"></script> -->
+    <script>
+			var require = { paths: { vs: 'https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs' } };
+		</script>
+    <script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/loader.min.js"></script>
+    <script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/editor/editor.main.nls.js"></script>
+    <script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/editor/editor.main.js"></script>
+    <link rel="stylesheet" href="/css/editor-preset-vision.css" />
+    <script>
+      window.pageConfig = {
+        env: 'release',
+        locale: 'zh_CN',
+        pageType: 'single',
+        deviceType: 'web',
+        appName: '基础包管理后台',
+        appType: 'legao_base_packages',
+        templateType: '',
+        pageId: 'FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V',
+        slug: 'test',
+        appMode: 'back',
+        isAppAdmin: 'y',
+        isSuperAdmin: 'n',
+        isBetaDeveloper: 'n',
+        formType: 'display',
+        title: { en_US: '测试', type: 'i18n', zh_CN: '测试' },
+        urlPrefix: 'https://go.alibaba-inc.com',
+        APIUrlPrefix: 'https://go.alibaba-inc.com',
+        devVersion: '0.1.0', // 这个是子应用的变更 id
+        subAppType: '0.1.0',
+        appKey: 'legao_base_packages',
+        RE_VERSION: '7.1.1',
+        appSource: '',
+        isDomainDefault: 'n',
+        useReleaseBundle: 'n',
+        isDomainPkg: 'n',
+        medusaAppName: '',
+        domainCode: 'kS6SyH',
+        aecp: {
+          mdcDomain: '',
+          projectId: '',
+          appCode: '',
+        },
+        designerConfigs: {},
+        navConfig:
+          '{"appName":{"en_US":"基础包管理后台","key":"","type":"i18n","zh_CN":"基础包管理后台"},"bgColor":"white","data":[{"children":[],"hidden":false,"icon":"","inner":true,"navUuid":"FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V","relateUuid":"FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V","slug":"test","targetNew":false,"title":{"en_US":"测试","type":"i18n","zh_CN":"测试"}}],"isFixed":"y","isFold":"y","isFoldHorizontal":"n","languageChangeUrl":{"en_US":"/common/account/changeAccountLanguage.json","type":"i18n","zh_CN":"/common/account/changeAccountLanguage.json"},"layout":"auto","navStyle":"orange","navTheme":"light","openSubMode":false,"showAppTitle":true,"showCrumb":true,"showIcon":false,"showLanguageChange":true,"showNav":true,"showSearch":"n","singletons":{"FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V":{"isFixed":"n","isFold":"n","isFoldHorizontal":"n","showAppTitle":false,"showCrumb":false,"showLanguageChange":false,"showNav":false,"showSearch":"n","singleton":false},"test":{"$ref":"$.singletons.FORM\\-3KYJN7RV\\-DIOD8LLK1WGQ89S7NHA92\\-QJVH497K\\-V"}},"type":"top_fold"}',
+        historyType: 'HASH',
+        isSinglePage: 'n',
+        rhino: 'n',
+        isMiniApp: '',
+        taskId: '',
+        appSchema: 'V5',
+        openSubMode: 'n',
+      };
+      window.g_config = {};
+    </script>
+  </head>
+
+  <body>
+    <!-- lowcode engine globals -->
+    <div id="lce-container"></div>
+    <!-- vision 测试使用
+
+    -->
+    <script src="/js/editor-preset-vision.js"></script>
+    <script src="https://dev.g.alicdn.com/vision/visualengine-utils/5.0.0/engine-utils.js"></script>
+  </body>
+</html>
diff --git a/packages/ignitor/public/preview.html b/packages/ignitor/public/preview.html
new file mode 100644
index 000000000..8f6c9e4c4
--- /dev/null
+++ b/packages/ignitor/public/preview.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width" />
+    <title>LowCodeEngine DEMO</title>
+    <script src="https://g.alicdn.com/code/lib/react/16.9.0/umd/react.development.js"></script>
+    <script src="https://g.alicdn.com/code/lib/react-dom/16.9.0/umd/react-dom.development.js"></script>
+    <script src="https://g.alicdn.com/code/lib/prop-types/15.7.2/prop-types.js"></script>
+    <script> React.PropTypes = PropTypes; </script>
+    <script src="https://g.alicdn.com/mylib/moment/2.24.0/min/moment.min.js"></script>
+
+    <link rel="stylesheet" href="https://alifd.alicdn.com/npm/@alifd/next/1.11.6/next.min.css">
+    <script src="https://unpkg.alibaba-inc.com/@alifd/next@1.18.17/dist/next.min.js"></script>
+  </head>
+
+  <body>
+    <div id="lce-container"></div>
+    <script type="text/javascript" src="/js/preview.js"></script>
+  </body>
+</html>
diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx
index 951ceea27..227f35a7c 100644
--- a/packages/renderer-core/src/hoc/leaf.tsx
+++ b/packages/renderer-core/src/hoc/leaf.tsx
@@ -371,10 +371,13 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
         const preNodeProps = this.state.nodeProps;
         const newNodeProps = {
           ...preNodeProps,
-          [key as string]: newValue,
           ...nodeProps,
         };
-        __debug(`${leaf?.componentName}[${this.props.componentId}] component trigger onPropsChange event`, newNodeProps);
+        if (key && !(key in newNodeProps) && (key in this.props)) {
+          // 当 key 在 this.props 中时，且不存在在计算值中，需要用 newValue 覆盖掉 this.props 的取值
+          newNodeProps[key] = newValue;
+        }
+        __debug(`${leaf?.componentName}[${this.props.componentId}] component trigger onPropsChange!`, newNodeProps);
         this.setState('children' in nodeProps ? {
           nodeChildren: nodeProps.children,
           nodeProps: newNodeProps,