amis 1.2.4-beta.10 → 1.2.4-beta.11

package/src/store/app.ts

@@ -45,12 +45,8 @@ export const AppStore = ServiceStore.named('AppStore')
 
       return [
         {
-          label: '导航',
-          children: [
-            {
-              label: '暂无页面'
-            }
-          ]
+          label: self.__('App.navigation'),
+          children: []
         }
       ];
     },
@@ -148,9 +144,10 @@ export const AppStore = ServiceStore.named('AppStore')
             ...item,
             path: ''
           });
+          self.__;
           if (bcn[0].path !== '/') {
             bcn.unshift({
-              label: '首页',
+              label: self.__('App.home'),
               path: '/'
             });
           }

package/src/store/formItem.ts

@@ -150,17 +150,21 @@ export const FormItemStore = StoreNode.named('FormItemStore')
         return getLastOptionValue();
       },
 
-      getSelectedOptions: (value: any = self.tmpValue) => {
+      getSelectedOptions: (
+        value: any = self.tmpValue,
+        nodeValueArray?: any[] | undefined
+      ) => {
         if (typeof value === 'undefined') {
           return [];
         }
 
-        const valueArray = Array.isArray(value)
+        const valueArray = nodeValueArray
+          ? nodeValueArray
+          : Array.isArray(value)
           ? value
           : typeof value === 'string'
           ? value.split(self.delimiter || ',')
           : [value];
-
         const selected = valueArray.map(item =>
           item && item.hasOwnProperty(self.valueField || 'value')
             ? item[self.valueField || 'value']
@@ -681,6 +685,105 @@ export const FormItemStore = StoreNode.named('FormItemStore')
       return json;
     });
 
+    /**
+     * 根据当前节点路径展开树形组件父节点
+     */
+    const expandTreeOptions: (
+      nodePathArr: any[],
+      api: Api,
+      data?: object,
+      config?: fetchOptions
+    ) => Promise<Payload | null | void> = flow(function* getInitData(
+      nodePathArr: any[],
+      api: string,
+      data: object,
+      config?: fetchOptions
+    ) {
+      // 多选模式下需要记录遍历过的Node，避免发送相同的请求
+      const traversedNode = new Map();
+
+      for (let nodePath of nodePathArr) {
+        // 根节点已经展开了，不需要加载
+        if (nodePath.length <= 1) {
+          continue;
+        }
+
+        // 叶节点不需要展开
+        for (let level = 0; level < nodePath.length - 1; level++) {
+          let tree = self.options.concat();
+          let nodeValue = nodePath[level];
+
+          if (traversedNode.has(nodeValue)) {
+            continue;
+          }
+          // 节点value认为是唯一的
+          let node = findTree(tree, (item, key, treeLevel: number) => {
+            return (
+              treeLevel === level + 1 &&
+              optionValueCompare(nodeValue, self.valueField || 'value')(item)
+            );
+          });
+
+          // 只处理懒加载节点
+          if (!node || !node.defer) {
+            continue;
+          }
+          const indexes = findTreeIndex(
+            tree,
+            item => item === node
+          ) as number[];
+
+          setOptions(
+            spliceTree(tree, indexes, 1, {
+              ...node,
+              loading: true
+            }),
+            undefined,
+            node
+          );
+
+          let json = yield fetchOptions(
+            api,
+            node,
+            {...config, silent: true},
+            false
+          );
+
+          if (!json) {
+            setOptions(
+              spliceTree(tree, indexes, 1, {
+                ...node,
+                loading: false,
+                error: true
+              }),
+              undefined,
+              node
+            );
+          }
+
+          traversedNode.set(nodeValue, true);
+
+          let childrenOptions: Array<IOption> =
+            json.data?.options ||
+            json.data.items ||
+            json.data.rows ||
+            json.data ||
+            [];
+
+          setOptions(
+            spliceTree(tree, indexes, 1, {
+              ...node,
+              loading: false,
+              loaded: true,
+              children: childrenOptions
+            }),
+            undefined,
+            node
+          );
+        }
+      }
+    });
+
     // @issue 强依赖form，需要改造暂且放过。
     function syncOptions(originOptions?: Array<any>, data?: Object) {
       if (!self.options.length && typeof self.value === 'undefined') {
@@ -896,6 +999,7 @@ export const FormItemStore = StoreNode.named('FormItemStore')
       setOptions,
       loadOptions,
       deferLoadOptions,
+      expandTreeOptions,
       syncOptions,
       setLoading,
       setSubStore,

package/src/utils/helper.ts

@@ -2,6 +2,7 @@ import isPlainObject from 'lodash/isPlainObject';
 import isEqual from 'lodash/isEqual';
 import isNaN from 'lodash/isNaN';
 import uniq from 'lodash/uniq';
+import last from 'lodash/last';
 import {Schema, PlainObject, FunctionPropertyNames} from '../types';
 import {evalExpression} from './tpl';
 import qs from 'qs';
@@ -270,10 +271,9 @@ export function anyChanged(
   to: {[propName: string]: any},
   strictMode: boolean = true
 ): boolean {
-  return (typeof attrs === 'string'
-    ? attrs.split(/\s*,\s*/)
-    : attrs
-  ).some(key => (strictMode ? from[key] !== to[key] : from[key] != to[key]));
+  return (typeof attrs === 'string' ? attrs.split(/\s*,\s*/) : attrs).some(
+    key => (strictMode ? from[key] !== to[key] : from[key] != to[key])
+  );
 }
 
 export function rmUndefined(obj: PlainObject) {
@@ -558,9 +558,7 @@ export function makeHorizontalDeeper(
 
 export function promisify<T extends Function>(
   fn: T
-): (
-  ...args: Array<any>
-) => Promise<any> & {
+): (...args: Array<any>) => Promise<any> & {
   raw: T;
 } {
   let promisified = function () {
@@ -1621,3 +1619,66 @@ export function detectPropValueChanged<
 export function removeHTMLTag(str: string) {
   return str.replace(/<\/?[^>]+(>|$)/g, '');
 }
+
+/**
+ * 将路径格式的value转换成普通格式的value值
+ *
+ * @example
+ *
+ * 'a/b/c' => 'c';
+ * {label: 'A/B/C', value: 'a/b/c'} => {label: 'C', value: 'c'};
+ * 'a/b/c,a/d' => 'c,d';
+ * ['a/b/c', 'a/d'] => ['c', 'd'];
+ * [{label: 'A/B/C', value: 'a/b/c'},{label: 'A/D', value: 'a/d'}] => [{label: 'C', value: 'c'},{label: 'D', value: 'd'}]
+ */
+export function normalizeNodePath(
+  value: any,
+  enableNodePath: boolean,
+  labelField: string = 'label',
+  valueField: string = 'value',
+  pathSeparator: string = '/',
+  delimiter: string = ','
+) {
+  const nodeValueArray: any[] = [];
+  const nodePathArray: any[] = [];
+  const getLastNodeFromPath = (path: any) =>
+    last(path ? path.toString().split(pathSeparator) : []);
+
+  if (typeof value === 'undefined' || !enableNodePath) {
+    return {nodeValueArray, nodePathArray};
+  }
+
+  // 尾节点为当前options中value值
+  if (Array.isArray(value)) {
+    value.forEach(nodePath => {
+      if (nodePath && nodePath.hasOwnProperty(valueField)) {
+        nodeValueArray.push({
+          ...nodePath,
+          [labelField]: getLastNodeFromPath(nodePath[labelField]),
+          [valueField]: getLastNodeFromPath(nodePath[valueField])
+        });
+        nodePathArray.push(nodePath[valueField]);
+      } else {
+        nodeValueArray.push(getLastNodeFromPath(nodePath));
+        nodePathArray.push(nodePath);
+      }
+    });
+  } else if (typeof value === 'string') {
+    value
+      .toString()
+      .split(delimiter)
+      .forEach(path => {
+        nodeValueArray.push(getLastNodeFromPath(path));
+        nodePathArray.push(path);
+      });
+  } else {
+    nodeValueArray.push({
+      ...value,
+      [labelField]: getLastNodeFromPath(value[labelField]),
+      [valueField || 'value']: getLastNodeFromPath(value[valueField])
+    });
+    nodePathArray.push(value[valueField]);
+  }
+
+  return {nodeValueArray, nodePathArray};
+}

package/src/utils/markdown.ts

@@ -3,11 +3,15 @@
  */
 
 import markdownIt from 'markdown-it';
+// @ts-ignore
+import {html5Media} from 'markdown-it-html5-media';
 
 const markdown = markdownIt({
   linkify: true
 });
 
+markdown.use(html5Media);
+
 export default function (content: string) {
   return markdown.render(content);
 }