@jiangood/springboot-admin-starter 0.0.8 → 0.0.9

package/package.json

@@ -32,7 +32,7 @@
     "config/dist/*"
   ],
   "main": "src/index.ts",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/framework/field-components/FieldDateRange.jsx

@@ -4,7 +4,9 @@
 import React from "react";
 import dayjs from "dayjs";
 import {DatePicker, TimePicker} from "antd";
+import {StringUtils} from "../utils";
 
+const SP = StringUtils.ISO_SPLITTER;
 
 export class FieldDateRange extends React.Component {
     static defaultProps = {
@@ -82,7 +84,7 @@ export class FieldDateRange extends React.Component {
             return null;
         }
 
-        const arr = v.split("/")
+        const arr = v.split(SP)
         let s1 = arr[0];
         let s2 = arr[1];
         return [dayjs(s1), dayjs(s2)]
@@ -95,7 +97,7 @@ export class FieldDateRange extends React.Component {
         const s1 = d1 ? d1.format(fmt) : ""
         const s2 = d2 ? d2.format(fmt) : "";
 
-        return s1 + '/' + s2
+        return s1 + SP + s2
     }
 
 }

package/src/framework/field-components/FieldNumberRange.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+
+export interface FieldNumberRangeProps {
+    value?: string;
+    onChange?: (value: string) => void;
+}
+
+/**
+ * 数字的百分数输入框
+ */
+export class FieldNumberRange extends React.Component<FieldNumberRangeProps, any> {
+}
+

package/src/framework/field-components/FieldNumberRange.jsx

@@ -0,0 +1,59 @@
+import React from "react";
+import {InputNumber} from "antd";
+import {StringUtils} from "../utils";
+
+
+const SP = StringUtils.ISO_SPLITTER;
+
+export class FieldNumberRange extends React.Component {
+
+
+    onChangeA = (a) => {
+        const {b} = this.parse(this.props.value)
+        this.props.onChange && this.props.onChange(this.merge(a, b))
+    }
+    onChangeB = (b) => {
+        const {a} = this.parse(this.props.value)
+        this.props.onChange && this.props.onChange(this.merge(a, b))
+    }
+
+    merge(a, b) {
+        if (a == null) {
+            a = ''
+        }
+        if (b == null) {
+            b = ''
+        }
+        return a + SP + b;
+    }
+
+    parse(v) {
+        if (v == null) {
+            return {a: null, b: null}
+        }
+        const arr = v.split(SP);
+        return {a: arr[0], b: arr[1]}
+    }
+
+    componentDidMount() {
+        let {value, defaultValue} = this.props
+        if (value == null) {
+            this.props.onChange && this.props.onChange(defaultValue)
+        }
+
+    }
+
+
+    render() {
+        let {value, defaultValue} = this.props
+        if (value == null) {
+            value = defaultValue
+        }
+        const {a, b} = this.parse(value)
+
+        return <div style={{display: 'flex', alignItems: 'center'}}>
+            <InputNumber value={a} onChange={this.onChangeA}/> - <InputNumber value={b} onChange={this.onChangeB}/>
+        </div>
+    }
+
+}

package/src/framework/field-components/index.ts

@@ -11,6 +11,7 @@ export * from './FieldRemoteTreeSelectMultiple'
 export * from './FieldBoolean';
 export * from './FieldDate';
 export * from './FieldDateRange';
+export * from './FieldNumberRange';
 export * from './FieldTable'
 export * from './FieldTableSelect'
 export * from './FieldSysOrgTreeSelect'

package/src/framework/utils/StringUtils.ts

@@ -3,6 +3,8 @@
  */
 export class StringUtils {
 
+    static readonly ISO_SPLITTER = "/";
+
     /**
      * 移除字符串前缀
      * @param str 原始字符串

package/src/pages/flowable/InstanceInfo.jsx

@@ -117,16 +117,18 @@ export default class InstanceInfo extends React.Component {
     renderForm = () => {
         const {data} = this.state
         const {processDefinitionKey, businessKey} = data
+        const formKey = this.props.formKey || processDefinitionKey;
+        const formName = formKey + 'Form'
 
-        let formKey = this.props.formKey || processDefinitionKey + 'Form';
-        let ExForm = FormRegistryUtils.get(formKey);
+        // let formKey = this.props.formKey || processDefinitionKey + 'Form';
+        let ExForm = FormRegistryUtils.get(formName);
         if (!ExForm) {
             return <div>
                 <p>
-                未注册表单，请注册表单 {formKey}。
+                    未创建表单 {formName}。
                 </p>
                 <Typography.Text>
-                    表单路径：src/forms/{formKey}.jsx
+                    表单路径：src/forms/{formName}.jsx
                 </Typography.Text>
                 </div>
         }