amis 1.5.6-beta.4 → 1.5.6-beta.5

package/src/renderers/Form/InputFormula.tsx

@@ -0,0 +1,75 @@
+import React from 'react';
+import FormItem, {FormBaseControl, FormControlProps} from './Item';
+import FormulaPicker from '../../components/formula/Picker';
+import type {FuncGroup, VariableItem} from '../../components/formula/Editor';
+
+/**
+ * InputFormula 公式编辑器
+ * 文档：https://baidu.gitee.io/amis/docs/components/form/input-formula
+ */
+export interface InputFormulaControlSchema extends FormBaseControl {
+  type: 'input-formula';
+
+  /**
+   * evalMode 即直接就是表达式，否则
+   * 需要 ${这里面才是表达式}
+   * 默认为 true
+   */
+  evalMode?: boolean;
+
+  /**
+   * 用于提示的变量集合，默认为空
+   */
+  variables: Array<VariableItem>;
+
+  variableMode?: 'tabs' | 'tree';
+
+  /**
+   * 函数集合，默认不需要传，即  amis-formula 里面那个函数
+   * 如果有扩充，则需要传。
+   */
+  functions: Array<FuncGroup>;
+
+  /**
+   * 顶部标题，默认为表达式
+   */
+  header: string;
+}
+
+export interface InputFormulaProps
+  extends FormControlProps,
+    Omit<
+      InputFormulaControlSchema,
+      'options' | 'inputClassName' | 'className' | 'descriptionClassName'
+    > {}
+
+@FormItem({
+  type: 'input-formula'
+})
+export class InputFormulaRenderer extends React.Component<InputFormulaProps> {
+  render() {
+    const {
+      selectedOptions,
+      disabled,
+      onChange,
+      evalMode,
+      variables,
+      variableMode,
+      functions,
+      header
+    } = this.props;
+
+    return (
+      <FormulaPicker
+        value={selectedOptions}
+        disabled={disabled}
+        onChange={onChange}
+        evalMode={evalMode}
+        variables={variables}
+        variableMode={variableMode}
+        functions={functions}
+        header={header}
+      />
+    );
+  }
+}

package/src/renderers/Form/InputMonthRange.tsx

@@ -170,6 +170,7 @@ export default class MonthRangeControl extends React.Component<MonthRangeProps>
       maxDuration,
       data,
       format,
+      env,
       ...rest
     } = this.props;
 
@@ -184,6 +185,7 @@ export default class MonthRangeControl extends React.Component<MonthRangeProps>
           maxDate={maxDate ? filterDate(maxDate, data, format) : undefined}
           minDuration={minDuration ? parseDuration(minDuration) : undefined}
           maxDuration={maxDuration ? parseDuration(maxDuration) : undefined}
+          useMobileUI={env.useMobileUI}
         />
       </div>
     );

package/src/renderers/Form/InputQuarterRange.tsx

@@ -26,6 +26,7 @@ export default class QuarterRangeControl extends InputDateRange {
       maxDuration,
       data,
       format,
+      env,
       ...rest
     } = this.props;
 
@@ -44,6 +45,7 @@ export default class QuarterRangeControl extends InputDateRange {
           maxDate={maxDate ? filterDate(maxDate, data, format) : undefined}
           minDuration={minDuration ? parseDuration(minDuration) : undefined}
           maxDuration={maxDuration ? parseDuration(maxDuration) : undefined}
+          useMobileUI={env.useMobileUI}
         />
       </div>
     );

package/src/renderers/Form/InputYearRange.tsx

@@ -26,6 +26,7 @@ export default class YearRangeControl extends InputDateRange {
       maxDuration,
       data,
       format,
+      env,
       ...rest
     } = this.props;
 
@@ -44,6 +45,7 @@ export default class YearRangeControl extends InputDateRange {
           maxDate={maxDate ? filterDate(maxDate, data, format) : undefined}
           minDuration={minDuration ? parseDuration(minDuration) : undefined}
           maxDuration={maxDuration ? parseDuration(maxDuration) : undefined}
+          useMobileUI={env.useMobileUI}
         />
       </div>
     );

package/src/renderers/Form/TreeSelect.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import Overlay from '../../components/Overlay';
 import PopOver from '../../components/PopOver';
+import PopUp from '../../components/PopUp';
 
 import {
   OptionsControl,
@@ -17,7 +18,7 @@ import {Api} from '../../types';
 import {isEffectiveApi} from '../../utils/api';
 import Spinner from '../../components/Spinner';
 import ResultBox from '../../components/ResultBox';
-import {autobind, getTreeAncestors} from '../../utils/helper';
+import {autobind, getTreeAncestors, isMobile} from '../../utils/helper';
 import {findDOMNode} from 'react-dom';
 import {normalizeOptions} from '../../components/Select';
 
@@ -90,6 +91,7 @@ export interface TreeSelectProps extends OptionsControlProps {
   hideNodePathLabel?: boolean;
   enableNodePath?: boolean;
   pathSeparator?: string;
+  useMobileUI?: boolean;
 }
 
 export interface TreeSelectState {
@@ -502,67 +504,51 @@ export default class TreeSelectControl extends React.Component<
         : options;
 
     return (
-      <Overlay
-        container={popOverContainer || (() => this.container.current)}
-        target={() => this.target}
-        show
-      >
-        <PopOver
-          classPrefix={ns}
-          className={`${ns}TreeSelect-popover`}
-          style={{
-            minWidth: this.target ? this.target.offsetWidth : undefined
-          }}
-          onHide={this.close}
-          overlay
-        >
-          <TreeSelector
-            classPrefix={ns}
-            onlyChildren={onlyChildren}
-            labelField={labelField}
-            valueField={valueField}
-            disabled={disabled}
-            onChange={this.handleChange}
-            joinValues={joinValues}
-            extractValue={extractValue}
-            delimiter={delimiter}
-            placeholder={__(optionsPlaceholder)}
-            options={filtedOptions}
-            highlightTxt={this.state.inputValue}
-            multiple={multiple}
-            initiallyOpen={initiallyOpen}
-            unfoldedLevel={unfoldedLevel}
-            withChildren={withChildren}
-            rootLabel={__(rootLabel)}
-            rootValue={rootValue}
-            showIcon={showIcon}
-            showRadio={showRadio}
-            cascade={cascade}
-            foldedField="collapsed"
-            hideRoot
-            value={value || ''}
-            nodePath={nodePath}
-            enableNodePath={enableNodePath}
-            pathSeparator={pathSeparator}
-            maxLength={maxLength}
-            minLength={minLength}
-            onAdd={onAdd}
-            creatable={creatable}
-            createTip={createTip}
-            rootCreatable={rootCreatable}
-            rootCreateTip={rootCreateTip}
-            onEdit={onEdit}
-            editable={editable}
-            editTip={editTip}
-            removable={removable}
-            removeTip={removeTip}
-            onDelete={onDelete}
-            bultinCUD={!addControls && !editControls}
-            onDeferLoad={deferLoad}
-            onExpandTree={expandTreeOptions}
-          />
-        </PopOver>
-      </Overlay>
+      <TreeSelector
+        classPrefix={ns}
+        onlyChildren={onlyChildren}
+        labelField={labelField}
+        valueField={valueField}
+        disabled={disabled}
+        onChange={this.handleChange}
+        joinValues={joinValues}
+        extractValue={extractValue}
+        delimiter={delimiter}
+        placeholder={__(optionsPlaceholder)}
+        options={filtedOptions}
+        highlightTxt={this.state.inputValue}
+        multiple={multiple}
+        initiallyOpen={initiallyOpen}
+        unfoldedLevel={unfoldedLevel}
+        withChildren={withChildren}
+        rootLabel={__(rootLabel)}
+        rootValue={rootValue}
+        showIcon={showIcon}
+        showRadio={showRadio}
+        cascade={cascade}
+        foldedField="collapsed"
+        hideRoot
+        value={value || ''}
+        nodePath={nodePath}
+        enableNodePath={enableNodePath}
+        pathSeparator={pathSeparator}
+        maxLength={maxLength}
+        minLength={minLength}
+        onAdd={onAdd}
+        creatable={creatable}
+        createTip={createTip}
+        rootCreatable={rootCreatable}
+        rootCreateTip={rootCreateTip}
+        onEdit={onEdit}
+        editable={editable}
+        editTip={editTip}
+        removable={removable}
+        removeTip={removeTip}
+        onDelete={onDelete}
+        bultinCUD={!addControls && !editControls}
+        onDeferLoad={deferLoad}
+        onExpandTree={expandTreeOptions}
+      />
     );
   }
 
@@ -581,9 +567,13 @@ export default class TreeSelectControl extends React.Component<
       autoComplete,
       selectedOptions,
       placeholder,
+      popOverContainer,
+      env,
       translate: __
     } = this.props;
 
+    const { isOpened } = this.state;
+    const { useMobileUI } = env;
     return (
       <div ref={this.container} className={cx(`TreeSelectControl`, className)}>
         <ResultBox
@@ -622,7 +612,36 @@ export default class TreeSelectControl extends React.Component<
         >
           {loading ? <Spinner size="sm" /> : undefined}
         </ResultBox>
-        {this.state.isOpened ? this.renderOuter() : null}
+        { !(useMobileUI && isMobile()) && isOpened ? (
+          <Overlay
+            container={popOverContainer || (() => this.container.current)}
+            target={() => this.target}
+            show
+          >
+            <PopOver
+              classPrefix={ns}
+              className={`${ns}TreeSelect-popover`}
+              style={{
+                minWidth: this.target ? this.target.offsetWidth : undefined
+              }}
+              onHide={this.close}
+              overlay
+            >
+              {this.renderOuter()}
+            </PopOver>
+          </Overlay>
+        ) : null}
+        {
+          useMobileUI && isMobile() && (
+            <PopUp
+              className={cx(`${ns}TreeSelect-popup`)}
+              isShow={isOpened}
+              onHide={this.close}
+            >
+              {this.renderOuter()}
+            </PopUp>
+          )
+        }
       </div>
     );
   }

package/src/renderers/Steps.tsx

@@ -83,9 +83,10 @@ export function StepsCmpt(props: StepsProps) {
     data,
     source,
     config,
-    render
+    render,
+    env
   } = props;
-  
+
   const stepsRow =
     (resolveVariable(source, data) as Array<StepSchema>) ||
     config ||
@@ -140,6 +141,7 @@ export function StepsCmpt(props: StepsProps) {
       className={className}
       status={status}
       mode={mode}
+      useMobileUI={env.useMobileUI}
     ></Steps>
   );
 }

package/src/utils/api.ts

@@ -98,14 +98,17 @@ export function buildApi(
   if (~idx) {
     const hashIdx = api.url.indexOf('#');
     const params = qsparse(
-      api.url.substring(idx + 1, ~hashIdx ? hashIdx : undefined)
+      api.url.substring(
+        idx + 1,
+        ~hashIdx && hashIdx > idx ? hashIdx : undefined
+      )
     );
     api.url =
       tokenize(api.url.substring(0, idx + 1), data, '| url_encode') +
       qsstringify(
         (api.query = dataMapping(params, data, undefined, api.convertKeyToPath))
       ) +
-      (~hashIdx ? api.url.substring(hashIdx) : '');
+      (~hashIdx && hashIdx > idx ? api.url.substring(hashIdx) : '');
   } else {
     api.url = tokenize(api.url, data, '| url_encode');
   }