Merge pull request #199 from leezng/dev

release 2.2.2

Author: leezng

example/Basic.vue

@@ -72,9 +72,9 @@
       >
         <template v-if="state.useRenderNodeKeySlot" #renderNodeKey="{ node, defaultKey }">
           <template v-if="node.key === 'title'">
-            <a>"{{ node.key }}":</a>
+            <a>"{{ node.key }}"</a>
           </template>
-          <template v-else>{{ defaultKey }}:</template>
+          <template v-else>{{ defaultKey }}</template>
         </template>
 
         <template v-if="state.useRenderNodeValueSlot" #renderNodeValue="{ node, defaultValue }">

src/components/TreeNode/index.tsx

@@ -122,7 +122,7 @@ export default defineComponent({
 
       return render
         ? render({ node: props.node, defaultKey: prettyKey.value || '' })
-        : <span class="vjs-key">{`${prettyKey.value}: `}</span>;
+        : prettyKey.value;
     };
 
     const isMultiple = computed(() => props.selectableType === 'multiple');
@@ -235,7 +235,12 @@ export default defineComponent({
             {props.showIcon && <Carets nodeType={node.type} onClick={handleIconClick} />}
           </div>
 
-          {node.key && renderKey()}
+          {node.key && (
+            <span class="vjs-key">
+              {renderKey()}
+              <span>:</span>
+            </span>
+          )}
 
           <span>
             {node.type !== 'content' && node.content ? (

src/utils/index.ts

@@ -76,7 +76,7 @@ export function jsonFlatten(
       keys.map((objKey, idx, arr) =>
         jsonFlatten(
           (data as Record<string, JSONDataType>)[objKey],
-          objKey.includes('.') ? `${path}["${objKey}"]` : `${path}.${objKey}`,
+          /^[a-zA-Z_]\w*$/.test(objKey) ? `${path}.${objKey}` : `${path}["${objKey}"]`,
           level + 1,
           {
             key: objKey,
@@ -171,3 +171,79 @@ export function stringToAutoType(source: string): unknown {
   }
   return value;
 }
+
+// function jsonFlattenNext(data: JSONDataType, path = 'root'): JSONFlattenReturnType[] {
+//   function test(content: unknown, path: string, level: number, options: JSONFlattenOptions) {
+//     const { type = 'content', key, index, showComma, length } = options || {};
+//     return {
+//       content,
+//       level,
+//       key,
+//       index,
+//       path,
+//       showComma,
+//       length,
+//       type,
+//     };
+//   }
+
+//   let endObj = {} as Record<string, unknown>;
+//   let i = 0;
+//   let output: any = [data];
+//   let startArr = [];
+//   while (output.length || endObj[i]) {
+//     if (i && endObj[i]) {
+//       const k = endObj[i];
+//       delete endObj[i];
+//       startArr.push(k);
+//       i++;
+//     } else {
+//       const now = output.shift();
+//       if (Array.isArray(now)) {
+//         startArr.push(
+//           test('[', path, 0, {
+//             type: 'arrayStart',
+//             showComma: false,
+//             length: now.length,
+//           }),
+//         );
+//         output = now.concat(output);
+//         Object.keys(endObj)
+//           .sort((a, b) => Number(b) - Number(a))
+//           .forEach(id => {
+//             endObj[Number(id) + now.length + 1] = endObj[id];
+//             delete endObj[id];
+//           });
+//         endObj[i + now.length] = ']';
+//       } else if (typeof now === 'object') {
+//         startArr.push(
+//           test('{', path, 0, {
+//             type: 'objectStart',
+//             showComma: false,
+//             length: Object.keys(now).length,
+//           }),
+//         );
+//         output = Object.keys(now)
+//           .map(key => now[key])
+//           .concat(output);
+//         Object.keys(endObj)
+//           .sort((a, b) => Number(b) - Number(a))
+//           .forEach(id => {
+//             endObj[Number(id) + Object.keys(now).length + 1] = endObj[id];
+//             delete endObj[id];
+//           });
+//         endObj[i + Object.keys(now).length] = '}';
+//       } else {
+//         startArr.push(
+//           test(now, path, 0, {
+//             type: 'content',
+//             showComma: false,
+//             length: 0,
+//           }),
+//         );
+//       }
+//     }
+//   }
+
+//   return startArr as any;
+// }