amis-editor 5.2.1-beta.35 → 5.2.3-beta.16

package/lib/plugin/Plain.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
+var helper = require('../renderer/event-control/helper.js');
 var i18nRuntime = require('i18n-runtime');
 
 var PlainPlugin = /** @class */function (_super) {
@@ -104,6 +105,59 @@ var PlainPlugin = /** @class */function (_super) {
       writable: true,
       value: i18nRuntime.i18n("ffb01e5bcf4c00447f5150d3cba81371")
     });
+    // 事件定义
+    Object.defineProperty(_this, "events", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: [{
+        eventName: 'click',
+        eventLabel: i18nRuntime.i18n("4363c17ebb346b646af55bd8c8075915"),
+        description: i18nRuntime.i18n("7af5e3ef39ff71d39fe3f645c8079124"),
+        dataSchema: [{
+          type: 'object',
+          properties: {
+            nativeEvent: {
+              type: 'object',
+              title: i18nRuntime.i18n("64561733c68085af3d09315c1d4d7ed6")
+            }
+          }
+        }]
+      }, {
+        eventName: 'mouseenter',
+        eventLabel: i18nRuntime.i18n("f6d767f39ba3bf955077a3c0ce81e581"),
+        description: i18nRuntime.i18n("bcdd89d453da0dc0622a2f3189728357"),
+        dataSchema: [{
+          type: 'object',
+          properties: {
+            nativeEvent: {
+              type: 'object',
+              title: i18nRuntime.i18n("64561733c68085af3d09315c1d4d7ed6")
+            }
+          }
+        }]
+      }, {
+        eventName: 'mouseleave',
+        eventLabel: i18nRuntime.i18n("e272b0b8c7fedc670a87075514d9b49f"),
+        description: i18nRuntime.i18n("727309bc724ff237c5e2cdf7a90cf28e"),
+        dataSchema: [{
+          type: 'object',
+          properties: {
+            nativeEvent: {
+              type: 'object',
+              title: i18nRuntime.i18n("64561733c68085af3d09315c1d4d7ed6")
+            }
+          }
+        }]
+      }]
+    });
+    // 动作定义
+    Object.defineProperty(_this, "actions", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: []
+    });
     Object.defineProperty(_this, "panelBodyCreator", {
       enumerable: true,
       configurable: true,
@@ -138,6 +192,12 @@ var PlainPlugin = /** @class */function (_super) {
         }, isTableCell ? null : {
           title: i18nRuntime.i18n("33bf801796fd255b5f6147e33146669b"),
           body: [amisEditorCore.getSchemaTpl('ref'), amisEditorCore.getSchemaTpl('visible')]
+        }, {
+          title: i18nRuntime.i18n("10b2761db5a8e089049df39675abc550"),
+          className: 'p-none',
+          body: [amisEditorCore.getSchemaTpl('eventControl', tslib.__assign({
+            name: 'onEvent'
+          }, helper.getEventControlConfig(_this.manager, context)))]
         }]);
       }
     });

package/lib/plugin/Progress.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/Property.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/QRCode.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/Reset.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/Service.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/Sparkline.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/Status.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -116,12 +116,10 @@ var StatusPlugin = /** @class */function (_super) {
             },
             descrition: i18nRuntime.i18n("b698a95f1e217e5465835ee0d23b1b1c"),
             pipeIn: amisEditorCore.defaultValue(['fa fa-times text-danger', 'fa fa-check text-success'])
-          }, {
-            name: 'placeholder',
-            type: 'input-text',
-            pipeIn: amisEditorCore.defaultValue('-'),
-            label: i18nRuntime.i18n("4c1cff4d8c05daa6ed9352a241ee628c")
-          }]
+          }, amisEditorCore.getSchemaTpl('placeholder', {
+            label: i18nRuntime.i18n("4c1cff4d8c05daa6ed9352a241ee628c"),
+            pipeIn: amisEditorCore.defaultValue('-')
+          })]
         }, {
           title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
           body: [amisEditorCore.getSchemaTpl('className')]

package/lib/plugin/Steps.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -120,22 +120,10 @@ var StepsPlugin = /** @class */function (_super) {
           minLength: 2,
           multiple: true,
           draggable: true,
-          items: [{
-            type: 'input-text',
-            name: 'title',
+          items: [amisEditorCore.getSchemaTpl('title', {
             label: false,
             placeholder: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab")
-          }, {
-            type: 'input-text',
-            name: 'subTitle',
-            label: false,
-            placeholder: i18nRuntime.i18n("72cf373be86a38b29f6d2f15900b0da1")
-          }, {
-            type: 'input-text',
-            name: 'description',
-            label: false,
-            placeholder: i18nRuntime.i18n("3bdd08adab6ea90b9164b20a0e4151ac")
-          }]
+          }), amisEditorCore.getSchemaTpl('stepSubTitle'), amisEditorCore.getSchemaTpl('stepDescription')]
         }), {
           name: 'value',
           type: 'input-text',

package/lib/plugin/Submit.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/Table.d.ts

@@ -15,7 +15,7 @@ export declare class TablePlugin extends BasePlugin {
     scaffold: SchemaObject;
     regions: Array<RegionConfig>;
     previewSchema: any;
-    scaffoldForm: ScaffoldForm;
+    get scaffoldForm(): ScaffoldForm;
     panelTitle: string;
     events: RendererPluginEvent[];
     actions: RendererPluginAction[];
@@ -23,5 +23,5 @@ export declare class TablePlugin extends BasePlugin {
     filterProps(props: any): any;
     getRendererInfo(context: RendererInfoResolveEventContext): BasicRendererInfo | void;
     beforeInsert(event: PluginEvent<InsertEventContext>): void;
-    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType): Promise<any>;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
 }

package/lib/plugin/Table.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -12,6 +12,7 @@ var amis = require('amis');
 var amisCore = require('amis-core');
 var amisEditorCore = require('amis-editor-core');
 var helper = require('../renderer/event-control/helper.js');
+var mobxStateTree = require('mobx-state-tree');
 var i18nRuntime = require('i18n-runtime');
 
 var TablePlugin = /** @class */function (_super) {
@@ -126,71 +127,6 @@ var TablePlugin = /** @class */function (_super) {
         }]
       }
     });
-    Object.defineProperty(_this, "scaffoldForm", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: {
-        title: i18nRuntime.i18n("6b93fcfc1a5795189c6072fa6e86d4f6"),
-        body: [{
-          name: 'columns',
-          type: 'combo',
-          multiple: true,
-          label: false,
-          addButtonText: i18nRuntime.i18n("0c14e431f1b5ecd163f8fa010a0654c7"),
-          draggable: true,
-          items: [{
-            type: 'input-text',
-            name: 'label',
-            placeholder: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab")
-          }, {
-            type: 'input-text',
-            name: 'name',
-            placeholder: i18nRuntime.i18n("41a344642681efaaa418c228ba7fb45c")
-          }, {
-            type: 'select',
-            name: 'type',
-            placeholder: i18nRuntime.i18n("226b0912184333c81babf2f1894ec0c1"),
-            value: 'text',
-            options: [{
-              value: 'text',
-              label: i18nRuntime.i18n("ffb01e5bcf4c00447f5150d3cba81371")
-            }, {
-              value: 'tpl',
-              label: i18nRuntime.i18n("59cf15fe6b8d659c9bd2f86143534a06")
-            }, {
-              value: 'image',
-              label: i18nRuntime.i18n("20def7942674282277c3714ed7ea6ce0")
-            }, {
-              value: 'date',
-              label: i18nRuntime.i18n("4ff1e74e43a3586339251494117185ad")
-            },
-            // {
-            //     value: 'datetime',
-            //     label: '日期时间'
-            // },
-            // {
-            //     value: 'time',
-            //     label: '时间'
-            // },
-            {
-              value: 'progress',
-              label: i18nRuntime.i18n("c7bff79d059a0b7ff9b02441959d8be2")
-            }, {
-              value: 'status',
-              label: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b")
-            }, {
-              value: 'mapping',
-              label: i18nRuntime.i18n("9da188491dd34c4382a5b9f006194e41")
-            }, {
-              value: 'operation',
-              label: i18nRuntime.i18n("8abc564260a1564521e0c3a1d5419b4a")
-            }]
-          }]
-        }],
-        canRebuild: true
-      }
-    });
     Object.defineProperty(_this, "panelTitle", {
       enumerable: true,
       configurable: true,
@@ -364,11 +300,7 @@ var TablePlugin = /** @class */function (_super) {
           title: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
           body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
             value: 'left-top'
-          }), {
-            name: 'title',
-            type: 'input-text',
-            label: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab")
-          }, isCRUDBody ? null : {
+          }), amisEditorCore.getSchemaTpl('title'), isCRUDBody ? null : {
             name: 'source',
             type: 'input-text',
             label: i18nRuntime.i18n("c11322c9cc43ce3c004cf03f5ac0acd0"),
@@ -472,12 +404,7 @@ var TablePlugin = /** @class */function (_super) {
               label: i18nRuntime.i18n("b07deca9076bd3354b1b2709d58d725a"),
               value: 'none'
             }]
-          }, {
-            name: 'placeholder',
-            pipeIn: amisEditorCore.defaultValue(i18nRuntime.i18n("21efd88b67a39834582ad99aabb9dc60")),
-            type: 'input-text',
-            label: i18nRuntime.i18n("35ba83e053cef95e55dfffde279822b5")
-          }, {
+          }, amisEditorCore.getSchemaTpl('tablePlaceholder'), {
             name: 'rowClassNameExpr',
             type: 'input-text',
             label: i18nRuntime.i18n("76b3250fb1e8593fac075b64029300fa"),
@@ -511,6 +438,73 @@ var TablePlugin = /** @class */function (_super) {
     });
     return _this;
   }
+  Object.defineProperty(TablePlugin.prototype, "scaffoldForm", {
+    get: function () {
+      var i18nEnabled = mobxStateTree.getEnv(window.editorStore).i18nEnabled;
+      return {
+        title: i18nRuntime.i18n("6b93fcfc1a5795189c6072fa6e86d4f6"),
+        body: [{
+          name: 'columns',
+          type: 'combo',
+          multiple: true,
+          label: false,
+          addButtonText: i18nRuntime.i18n("0c14e431f1b5ecd163f8fa010a0654c7"),
+          draggable: true,
+          items: [{
+            type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+            name: 'label',
+            placeholder: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab")
+          }, {
+            type: 'input-text',
+            name: 'name',
+            placeholder: i18nRuntime.i18n("41a344642681efaaa418c228ba7fb45c")
+          }, {
+            type: 'select',
+            name: 'type',
+            placeholder: i18nRuntime.i18n("226b0912184333c81babf2f1894ec0c1"),
+            value: 'text',
+            options: [{
+              value: 'text',
+              label: i18nRuntime.i18n("ffb01e5bcf4c00447f5150d3cba81371")
+            }, {
+              value: 'tpl',
+              label: i18nRuntime.i18n("59cf15fe6b8d659c9bd2f86143534a06")
+            }, {
+              value: 'image',
+              label: i18nRuntime.i18n("20def7942674282277c3714ed7ea6ce0")
+            }, {
+              value: 'date',
+              label: i18nRuntime.i18n("4ff1e74e43a3586339251494117185ad")
+            },
+            // {
+            //     value: 'datetime',
+            //     label: '日期时间'
+            // },
+            // {
+            //     value: 'time',
+            //     label: '时间'
+            // },
+            {
+              value: 'progress',
+              label: i18nRuntime.i18n("c7bff79d059a0b7ff9b02441959d8be2")
+            }, {
+              value: 'status',
+              label: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b")
+            }, {
+              value: 'mapping',
+              label: i18nRuntime.i18n("9da188491dd34c4382a5b9f006194e41")
+            }, {
+              value: 'operation',
+              label: i18nRuntime.i18n("8abc564260a1564521e0c3a1d5419b4a")
+            }]
+          }]
+        }],
+        canRebuild: true
+      };
+    },
+    enumerable: false,
+    configurable: true
+  });
   Object.defineProperty(TablePlugin.prototype, "filterProps", {
     enumerable: false,
     configurable: true,
@@ -535,6 +529,8 @@ var TablePlugin = /** @class */function (_super) {
         // 只取10条预览，否则太多卡顿
         props.value = arr.slice(0, 10);
       }
+      // 编辑模式，不允许表格调整宽度
+      props.resizable = false;
       return props;
     }
   });
@@ -585,10 +581,10 @@ var TablePlugin = /** @class */function (_super) {
     enumerable: false,
     configurable: true,
     writable: true,
-    value: function (node, region) {
+    value: function (node, region, trigger) {
       var _a, _b;
       return tslib.__awaiter(this, void 0, void 0, function () {
-        var itemsSchema, columns, _i, _c, current, schema, _d, _e, _f;
+        var itemsSchema, columns, _i, _c, current, schema, _d, _e, _f, cellProperties, isColumnChild;
         return tslib.__generator(this, function (_g) {
           switch (_g.label) {
             case 0:
@@ -631,15 +627,23 @@ var TablePlugin = /** @class */function (_super) {
               if ((region === null || region === void 0 ? void 0 : region.region) === 'columns') {
                 return [2 /*return*/, itemsSchema];
               }
+              cellProperties = {};
+              if (trigger) {
+                isColumnChild = amisCore.someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
+                  return item.id === trigger.id;
+                });
+                isColumnChild && (cellProperties = itemsSchema.properties);
+              }
               return [2 /*return*/, {
                 $id: 'table',
                 type: 'object',
-                properties: {
-                  items: {
+                properties: tslib.__assign(tslib.__assign({}, cellProperties), {
+                  rows: {
                     type: 'array',
+                    title: i18nRuntime.i18n("77fdd35933c099cdcb64b71f3fbe7a6c"),
                     items: itemsSchema
                   }
-                }
+                })
               }];
           }
         });

package/lib/plugin/Table2.d.ts

@@ -17,7 +17,7 @@ export declare class Table2Plugin extends BasePlugin {
     panelTitle: string;
     events: RendererPluginEvent[];
     actions: RendererPluginAction[];
-    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType): Promise<any>;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
     getAvailableContextFields(scopeNode: EditorNodeType, node: EditorNodeType, region?: EditorNodeType): Promise<void>;
     panelBodyCreator: (context: BaseEventContext) => any;
     filterProps(props: any): any;

package/lib/plugin/Table2.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -481,12 +481,7 @@ var Table2Plugin = /** @class */function (_super) {
                 addOnclassName: 'border-0 bg-none',
                 tpl: 'px'
               }]
-            }, {
-              name: 'placeholder',
-              pipeIn: amisEditorCore.defaultValue(i18nRuntime.i18n("21efd88b67a39834582ad99aabb9dc60")),
-              type: 'input-text',
-              label: i18nRuntime.i18n("8ce1cd75b6e9c0c0e3468589fcea822c")
-            }]
+            }, amisEditorCore.getSchemaTpl('tablePlaceholder')]
           }, {
             title: i18nRuntime.i18n("949a8b7bd2c10070a2fae16f9c66afbb"),
             body: [amisEditorCore.getSchemaTpl('switch', {
@@ -725,10 +720,10 @@ var Table2Plugin = /** @class */function (_super) {
     enumerable: false,
     configurable: true,
     writable: true,
-    value: function (node, region) {
+    value: function (node, region, trigger) {
       var _a, _b;
       return tslib.__awaiter(this, void 0, void 0, function () {
-        var itemsSchema, columns, _i, _c, current, schema, _d, _e, _f, result;
+        var itemsSchema, columns, _i, _c, current, schema, _d, _e, _f, cellProperties, isColumnChild, result;
         return tslib.__generator(this, function (_g) {
           switch (_g.label) {
             case 0:
@@ -747,9 +742,9 @@ var Table2Plugin = /** @class */function (_super) {
               if (!(_i < _c.length)) return [3 /*break*/, 6];
               current = _c[_i];
               schema = current.schema;
-              if (!(schema && schema.key)) return [3 /*break*/, 5];
+              if (!(schema === null || schema === void 0 ? void 0 : schema.name)) return [3 /*break*/, 5];
               _d = itemsSchema.properties;
-              _e = schema.key;
+              _e = schema.name;
               if (!((_b = (_a = current.info) === null || _a === void 0 ? void 0 : _a.plugin) === null || _b === void 0 ? void 0 : _b.buildDataSchemas)) return [3 /*break*/, 3];
               return [4 /*yield*/, current.info.plugin.buildDataSchemas(current, region)];
             case 2:
@@ -769,16 +764,23 @@ var Table2Plugin = /** @class */function (_super) {
               _i++;
               return [3 /*break*/, 1];
             case 6:
+              cellProperties = {};
+              if (trigger) {
+                isColumnChild = amisCore.someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
+                  return item.id === trigger.id;
+                });
+                isColumnChild && (cellProperties = itemsSchema.properties);
+              }
               result = {
                 $id: 'table2',
                 type: 'object',
-                properties: {
-                  items: {
+                properties: tslib.__assign(tslib.__assign({}, cellProperties), {
+                  rows: {
                     type: 'array',
-                    title: i18nRuntime.i18n("642e5368b742c82472e2ef35114459c9"),
+                    title: i18nRuntime.i18n("77fdd35933c099cdcb64b71f3fbe7a6c"),
                     items: itemsSchema
                   }
-                }
+                })
               };
               if ((region === null || region === void 0 ? void 0 : region.region) === 'columns') {
                 result.properties = tslib.__assign(tslib.__assign({}, itemsSchema.properties), result.properties);

package/lib/plugin/TableCell2.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/plugin/TableView.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -224,11 +224,7 @@ var TableViewPlugin = /** @class */function (_super) {
           title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
           body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
             value: 'left-top'
-          }), {
-            label: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab"),
-            name: 'caption',
-            type: 'input-text'
-          }, {
+          }), amisEditorCore.getSchemaTpl('caption'), {
             label: i18nRuntime.i18n("3a8647306ee6456517b7bf9c8bc7de23"),
             name: 'captionSide',
             type: 'button-group-select',

package/lib/plugin/Tabs.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { BaseEventContext, BasePlugin, BasicToolbarItem, PluginEvent, PreventClickEventContext, RegionConfig, VRendererConfig } from 'amis-editor-core';
 export declare class TabsPlugin extends BasePlugin {
     rendererName: string;

package/lib/plugin/Tabs.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -215,11 +215,10 @@ var TabsPlugin = /** @class */function (_super) {
                   inline: false
                 }
               },
-              items: [{
-                type: 'input-text',
-                name: 'title',
+              items: [amisEditorCore.getSchemaTpl('title', {
+                label: false,
                 required: true
-              }]
+              })]
             }), amisEditorCore.getSchemaTpl('switch', {
               name: 'showTip',
               label: amisEditorCore.tipedLabel(i18nRuntime.i18n("3ba265c6b63bde0319822afd6b9a649d"), i18nRuntime.i18n("b744b72fd649d904e561358fc26c455f")),