合并分支 'dev' 到 'master'

zpc 查看合并请求 !5

合并分支 'dev' 到 'master'
zpc 查看合并请求 !5
9175599c · tony001 · 8d9fc3d8 · 911d9b97 · 8d9fc3d8 · 8d9fc3d8
--- a/APP/public/assets/images/logo.png
+++ b/APP/public/assets/images/logo.png
--- a/APP/public/favicon.ico
+++ b/APP/public/favicon.ico
--- a/APP/public/index.html.ftl
+++ b/APP/public/index.html.ftl
-<#ibiztemplate>
-TARGET=PSSYSAPP
-</#ibiztemplate>
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Web site created using create-react-app" />
-    <link rel="apple-touch-icon" href="logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-</head>
-
-<body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-</body>
-
-</html>
\ No newline at end of file
--- a/APP/public/manifest.json.ftl
+++ b/APP/public/manifest.json.ftl
-<#ibiztemplate>
-TARGET=PSSYSAPP
-</#ibiztemplate>
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
--- a/APP/src/App.tsx.ftl
+++ b/APP/src/App.tsx.ftl
@@ -75,7 +75,7 @@ export default class App extends PureComponent {
        return <div className="App">
            <Layout id="components-layout-demo-custom-trigger">
                <Sider trigger={null} collapsible style={{ minHeight: '100vh' }}>
-                    <div className="logo"><img src="https://cdn.ibizlab.cn/super-form/logo.png" /></div>
+                    <div className="logo"><img src="assets/images/logo.png" /></div>
                    <Menu theme="dark" mode="inline" defaultSelectedKeys={['<#if app.getAllPSAppViews()??><#list app.getAllPSAppViews() as singleView><#if singleView_index == 0></#if>"${singleView.getCodeName()}"</#list></#if>']} onClick={({ item, key, keyPath, domEvent }) => { this.handleMenuClick(item, key, keyPath, domEvent) }}>
                        <#if app.getAllPSAppViews()??>
                        <#list app.getAllPSAppViews() as singleView>

--- a/APP/src/ibizsys/components/app-rich-text-editor/app-rich-text-editor.tsx.ftl
+++ b/APP/src/ibizsys/components/app-rich-text-editor/app-rich-text-editor.tsx.ftl
@@ -200,10 +200,10 @@ export default class AppRichTextEditor extends PureComponent<RichTextProps> {
                { text: "C#", value: "csharp" },
                { text: "C++", value: "cpp" }
            ],
-            codesample_content_css: "https://cdn.ibizlab.cn/super-form/tinymce/prism.css",
-            skin_url: "https://cdn.ibizlab.cn/super-form/tinymce/skins/lightgray",
+            codesample_content_css: "assets/tinymce/prism.css",
+            skin_url: "assets/tinymce/skins/lightgray",
            language_url:
-                "https://cdn.ibizlab.cn/super-form/tinymce/langs/" +
+                "assets/tinymce/langs/" +
                (this.langu ? this.langu : "zh_CN") +
                ".js",
            setup: editor => {

--- a/README.md
+++ b/README.md
-# 超级表单React版
+# iBiz表单React版

 ## 简介

-超级表单React版是基于React和消费iBiz模型构建而成的表单Demo（下面简称表单），目前，该表单书写了我们表单常用的功能，如表单的栅格布局，flex布局，表单项动态显示，动态启用，动态空输入，表单值规则，表单的数据绑定，表单项的错误提示等功能。如果你的项目使用的前端框架是React,我们可以通过iBiz设计工具来设计我们的表单，然后把iBiz工具产生的成果物集成到我们的项目中，这样可以大大的减轻我们自己的工作压力。当然，由于业务场景的限制，如果有场景不满足，欢迎pr。
+iBiz表单React版是基于React和消费iBiz模型构建而成的表单Demo（下面简称表单），目前，该表单书写了我们表单常用的功能，如表单的栅格布局，flex布局，表单项动态显示，动态启用，动态空输入，表单值规则，表单的数据绑定，表单项的错误提示等功能。如果你的项目使用的前端框架是React,我们可以通过iBiz设计工具来设计我们的表单，然后把iBiz工具产生的成果物集成到我们的项目中，这样可以大大的减轻我们自己的工作压力。当然，由于业务场景的限制，如果有场景不满足，欢迎pr。

 ## 技术栈

@@ -20,7 +20,7 @@ yarn  start

 ## 项目结构

-把该超级表单集成到我们的项目中，也是非常方便的。了解项目集成之前，我们首先来看一下我们的表单目录结构，如下图1：
+把该iBiz表单集成到我们的项目中，也是非常方便的。了解项目集成之前，我们首先来看一下我们的表单目录结构，如下图1：

 <div align = center>![1570497166531](superFormReact.assets/1570497166531.png)</div>