@difizen/libro-jupyter 0.1.0 → 0.1.2

package/es/components/cell-execution-tip.js

@@ -1,8 +1,15 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { LoadingOutlined } from '@ant-design/icons';
 import { ExecutableCellView, CheckCircleOutlined, ExecutableCellModel } from '@difizen/libro-core';
 import { useObserve } from '@difizen/mana-app';
 import classnames from 'classnames';
 import moment from 'moment';
+import { useState } from 'react';
 import { formatTime, parseExecutionInfoFromModel, isWaitingExecute } from "../utils/index.js";
 import { InfoCircle } from "./icons.js";
 import "./index.less";
@@ -10,6 +17,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export function CellExecutionTip(_ref) {
   var cell = _ref.cell;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    setCurrentTime = _useState2[1];
   var observableCell = useObserve(cell);
   if (!ExecutableCellView.is(cell)) {
     return null;
@@ -43,6 +53,9 @@ export function CellExecutionTip(_ref) {
       })]
     });
   } else if (kernelExecuting) {
+    setTimeout(function () {
+      setCurrentTime(Date.now());
+    }, 100);
     return /*#__PURE__*/_jsxs("div", {
       className: classnames("libro-cell-execution-tip", !existOutput && 'libro-cell-execution-tip-without-output'),
       children: [/*#__PURE__*/_jsx("div", {
@@ -57,7 +70,7 @@ export function CellExecutionTip(_ref) {
     });
   } else if (waitingExecute) {
     return /*#__PURE__*/_jsxs("div", {
-      className: classnames("libro-cell-execution-tip", waitingExecute && 'libro-cell-execution-tip-without-output'),
+      className: classnames("libro-cell-execution-tip", !existOutput && 'libro-cell-execution-tip-without-output'),
       children: [/*#__PURE__*/_jsx("div", {
         className: "libro-cell-execution-tip-border"
       }), /*#__PURE__*/_jsx(InfoCircle, {}), /*#__PURE__*/_jsx("p", {

package/es/components/cell-input-bottom-blank.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-input-bottom-blank.d.ts","sourceRoot":"","sources":["../../src/components/cell-input-bottom-blank.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAKpD,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,kDAiBhE"}
+{"version":3,"file":"cell-input-bottom-blank.d.ts","sourceRoot":"","sources":["../../src/components/cell-input-bottom-blank.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAMpD,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,kDAsBhE"}

package/es/components/cell-input-bottom-blank.js

@@ -1,18 +1,18 @@
-import { LibroExecutableCellView } from '@difizen/libro-core';
+import { LibroExecutableCellView, LibroOutputArea } from '@difizen/libro-core';
 import { useObserve } from '@difizen/mana-app';
 import { isWaitingExecute } from "../utils/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function CellInputBottomBlank(_ref) {
   var cell = _ref.cell;
   var observableCell = useObserve(cell);
-  if (!(cell instanceof LibroExecutableCellView)) {
+  if (!(cell instanceof LibroExecutableCellView) || !(observableCell.outputArea instanceof LibroOutputArea)) {
     return null;
   }
   var outputs = observableCell.outputArea.outputs;
-  var hasNoneOutput = (!outputs || outputs.length === 0) && observableCell.model.executeCount;
+  var hasNoneOutput = !outputs || outputs.length === 0;
 
   // 有output时 或者 没有被执行过，不显示input底部的空白
-  if (hasNoneOutput || isWaitingExecute(observableCell.model)) {
+  if (hasNoneOutput && (observableCell.model.executeCount || isWaitingExecute(observableCell.model))) {
     return /*#__PURE__*/_jsx("div", {
       className: "libro-cell-bottom-blank"
     });

package/es/components/icons.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+export declare const InfoCircle: React.FC;
+export declare const WarningIcon: React.FC;
+export declare const Location: React.FC;
+//# sourceMappingURL=icons.d.ts.map

package/es/components/icons.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../../src/components/icons.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EA4C9B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAuC/B,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EA2B5B,CAAC"}

package/es/components/index.less

@@ -20,6 +20,7 @@
   }
 
   p {
+    margin: 0;
     width: calc(100% - 56px);
     white-space: nowrap;
     overflow: hidden;

package/es/config/config-contribution.d.ts

@@ -1,7 +1,7 @@
 import { ConfigurationContribution, ConfigurationService } from '@difizen/mana-app';
 import { ApplicationContribution } from '@difizen/mana-app';
-export declare class LibroSettingContribution implements ConfigurationContribution {
-    registerConfigurations(): import("@difizen/mana-app").ConfigurationNode<boolean>[];
+export declare class LibroJupyterSettingContribution implements ConfigurationContribution {
+    registerConfigurations(): (import("@difizen/mana-app").ConfigurationNode<boolean> | import("@difizen/mana-app").ConfigurationNode<string>)[];
 }
 export declare class ConfigAppContribution implements ApplicationContribution {
     configurationService: ConfigurationService;

package/es/config/config-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-contribution.d.ts","sourceRoot":"","sources":["../../src/config/config-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAK5D,qBACa,wBAAyB,YAAW,yBAAyB;IACxE,sBAAsB;CAGvB;AACD,qBACa,qBAAsB,YAAW,uBAAuB;IACrC,oBAAoB,EAAE,oBAAoB,CAAC;IACzE,WAAW;CAIZ"}
+{"version":3,"file":"config-contribution.d.ts","sourceRoot":"","sources":["../../src/config/config-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAK5D,qBACa,+BAAgC,YAAW,yBAAyB;IAC/E,sBAAsB;CAGvB;AACD,qBACa,qBAAsB,YAAW,uBAAuB;IACrC,oBAAoB,EAAE,oBAAoB,CAAC;IACzE,WAAW;CAIZ"}

package/es/config/config-contribution.js

@@ -12,20 +12,20 @@ import { AutoInsertWhenNoCell, EnterEditModeWhenAddCell } from '@difizen/libro-c
 import { ConfigurationContribution, ConfigurationService } from '@difizen/mana-app';
 import { ApplicationContribution } from '@difizen/mana-app';
 import { inject, singleton } from '@difizen/mana-app';
-import { LibroAutosaveSetting } from "./config.js";
-export var LibroSettingContribution = (_dec = singleton({
+import { LibroJupyterConfiguration } from "./config.js";
+export var LibroJupyterSettingContribution = (_dec = singleton({
   contrib: ConfigurationContribution
 }), _dec(_class = /*#__PURE__*/function () {
-  function LibroSettingContribution() {
-    _classCallCheck(this, LibroSettingContribution);
+  function LibroJupyterSettingContribution() {
+    _classCallCheck(this, LibroJupyterSettingContribution);
   }
-  _createClass(LibroSettingContribution, [{
+  _createClass(LibroJupyterSettingContribution, [{
     key: "registerConfigurations",
     value: function registerConfigurations() {
-      return [LibroAutosaveSetting];
+      return [LibroJupyterConfiguration.AutoSave, LibroJupyterConfiguration.OpenSlot];
     }
   }]);
-  return LibroSettingContribution;
+  return LibroJupyterSettingContribution;
 }()) || _class);
 export var ConfigAppContribution = (_dec2 = singleton({
   contrib: ApplicationContribution

package/es/config/config.d.ts

@@ -0,0 +1,8 @@
+import type { ConfigurationNode } from '@difizen/mana-app';
+export declare const LibroConfigAutoSave: ConfigurationNode<boolean>;
+export declare const LibroConfigOpenSlot: ConfigurationNode<string>;
+export declare const LibroJupyterConfiguration: {
+    AutoSave: ConfigurationNode<boolean>;
+    OpenSlot: ConfigurationNode<string>;
+};
+//# sourceMappingURL=config.d.ts.map

package/es/config/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAG3D,eAAO,MAAM,mBAAmB,EAAE,iBAAiB,CAAC,OAAO,CAS1D,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,iBAAiB,CAAC,MAAM,CASzD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;CAGrC,CAAC"}

package/es/config/config.js

@@ -1,5 +1,5 @@
 import { l10n } from '@difizen/mana-l10n';
-export var LibroAutosaveSetting = {
+export var LibroConfigAutoSave = {
   id: 'libro.autosave',
   description: l10n.t('是否自动保存修改'),
   title: 'checkbox',
@@ -8,4 +8,18 @@ export var LibroAutosaveSetting = {
   schema: {
     type: 'boolean'
   }
+};
+export var LibroConfigOpenSlot = {
+  id: 'libro.jupyter.open.slot',
+  description: '文件默认打开位置',
+  title: '文件默认打开位置',
+  type: 'checkbox',
+  defaultValue: 'main',
+  schema: {
+    type: 'string'
+  }
+};
+export var LibroJupyterConfiguration = {
+  AutoSave: LibroConfigAutoSave,
+  OpenSlot: LibroConfigOpenSlot
 };

package/es/config/index.d.ts

@@ -1,2 +1,3 @@
 export * from './config-contribution.js';
+export * from './config.js';
 //# sourceMappingURL=index.d.ts.map

package/es/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC"}

package/es/config/index.js

@@ -1 +1,2 @@
-export * from "./config-contribution.js";
+export * from "./config-contribution.js";
+export * from "./config.js";

package/es/file/file-command.d.ts

@@ -3,6 +3,7 @@ import { ViewManager } from '@difizen/mana-app';
 import { CommandContribution, FileStatNode, MenuContribution, ModalService, OpenerService, ToolbarContribution } from '@difizen/mana-app';
 import { JupyterFileService } from './file-service.js';
 import { FileView } from './file-view/index.js';
+import './index.less';
 export declare const FileTreeContextMenuPath: MenuPath;
 export declare class FileCommandContribution implements CommandContribution, MenuContribution, ToolbarContribution {
     protected viewManager: ViewManager;

package/es/file/file-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-command.d.ts","sourceRoot":"","sources":["../../src/file/file-command.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,mBAAmB,EACnB,YAAY,EAGZ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EAEb,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AA6ChD,eAAO,MAAM,uBAAuB,EAAE,QAAqC,CAAC;AAE5E,qBAGa,uBACX,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB;IAErE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACP,WAAW,EAAE,kBAAkB,CAAC;IACtC,YAAY,EAAE,YAAY,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;IAC5D,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC;IAC3B,cAAc,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,WAAW;IAazD,aAAa,CAAC,IAAI,EAAE,YAAY;IA+ChC,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAkKhD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAQ7D"}
+{"version":3,"file":"file-command.d.ts","sourceRoot":"","sources":["../../src/file/file-command.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,mBAAmB,EACnB,YAAY,EAEZ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EAEb,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,cAAc,CAAC;AAgDtB,eAAO,MAAM,uBAAuB,EAAE,QAAqC,CAAC;AAE5E,qBAGa,uBACX,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB;IAErE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACP,WAAW,EAAE,kBAAkB,CAAC;IACtC,YAAY,EAAE,YAAY,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;IAC5D,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC;IAC3B,cAAc,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,WAAW;IAazD,aAAa,CAAC,IAAI,EAAE,YAAY;IA+ChC,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAsKhD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAQ7D"}

package/es/file/file-command.js

@@ -14,7 +14,7 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 import pathUtil from 'path';
 import { ReloadOutlined } from '@ant-design/icons';
 import { ViewManager } from '@difizen/mana-app';
-import { CommandContribution, FileStatNode, FileTreeCommand, inject, MenuContribution, ModalService, OpenerService, singleton, ToolbarContribution, URI } from '@difizen/mana-app';
+import { CommandContribution, FileStatNode, inject, MenuContribution, ModalService, OpenerService, singleton, ToolbarContribution, URI } from '@difizen/mana-app';
 import { message, Modal } from 'antd';
 import { FileCreateModal } from "./file-create-modal.js";
 import { FileDirCreateModal } from "./file-createdir-modal.js";
@@ -22,6 +22,7 @@ import { FileRenameModal } from "./file-rename-modal.js";
 import { JupyterFileService } from "./file-service.js";
 import { FileView } from "./file-view/index.js";
 import { copy2clipboard } from "./utils.js";
+import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var FileCommands = {
   OPEN_FILE: {
@@ -63,6 +64,10 @@ var FileCommands = {
   REFRESH: {
     id: 'fileTree.command.refresh',
     label: '刷新'
+  },
+  REMOVE: {
+    id: 'fileTree.command.remove',
+    label: '删除'
   }
 };
 export var FileTreeContextMenuPath = ['file-tree-context-menu'];
@@ -166,13 +171,17 @@ export var FileCommandContribution = (_dec = singleton({
           return FileStatNode.is(node) && node.fileStat.isFile;
         }
       });
-      command.registerHandler(FileTreeCommand.REMOVE.id, {
+      command.registerHandler(FileCommands.REMOVE.id, {
         execute: function execute(node) {
           if (FileStatNode.is(node)) {
             var filePath = node.uri.path.toString();
             Modal.confirm({
-              title: '确认删除一下文件或文件夹？',
-              content: filePath,
+              width: 424,
+              title: '确认要删除这个文件/文件夹吗？',
+              content: "\u8BF7\u786E\u8BA4\u662F\u5426\u5220\u9664\u6587\u4EF6 ".concat(filePath, " \uFF0C\u5220\u9664\u540E\u5C06\u4E0D\u53EF\u6062\u590D\uFF0C\u8BF7\u8C28\u614E\u64CD\u4F5C\u3002"),
+              wrapClassName: 'libro-remove-file-modal',
+              cancelText: '取消',
+              okText: '确定',
               onOk: function () {
                 var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -309,11 +318,12 @@ export var FileCommandContribution = (_dec = singleton({
       command.registerCommand(FileCommands.CREATE_FILE, {
         execute: function () {
           var _execute3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
+            var _this2$fileView$model;
             var path;
             return _regeneratorRuntime().wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
-                  path = '/workspace';
+                  path = ((_this2$fileView$model = _this2.fileView.model.location) === null || _this2$fileView$model === void 0 ? void 0 : _this2$fileView$model.path.toString()) || '/';
                   if (FileStatNode.is(data)) {
                     path = data.fileStat.isDirectory ? data.uri.path.toString() : data.uri.path.dir.toString();
                   }
@@ -335,11 +345,12 @@ export var FileCommandContribution = (_dec = singleton({
       command.registerCommand(FileCommands.CREATE_DIR, {
         execute: function () {
           var _execute4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
+            var _this2$fileView$model2;
             var path;
             return _regeneratorRuntime().wrap(function _callee5$(_context5) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
-                  path = '/workspace';
+                  path = ((_this2$fileView$model2 = _this2.fileView.model.location) === null || _this2$fileView$model2 === void 0 ? void 0 : _this2$fileView$model2.path.toString()) || '/';
                   if (FileStatNode.is(data)) {
                     path = data.fileStat.isDirectory ? data.uri.path.toString() : data.uri.path.dir.toString();
                   }
@@ -361,11 +372,12 @@ export var FileCommandContribution = (_dec = singleton({
       command.registerCommand(FileCommands.COPY_PATH, {
         execute: function () {
           var _execute5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data) {
+            var _this2$fileView$model3;
             var path;
             return _regeneratorRuntime().wrap(function _callee6$(_context6) {
               while (1) switch (_context6.prev = _context6.next) {
                 case 0:
-                  path = '/workspace';
+                  path = ((_this2$fileView$model3 = _this2.fileView.model.location) === null || _this2$fileView$model3 === void 0 ? void 0 : _this2$fileView$model3.path.toString()) || '/';
                   if (FileStatNode.is(data)) {
                     path = data.uri.path.toString();
                   }
@@ -391,7 +403,7 @@ export var FileCommandContribution = (_dec = singleton({
                 case 0:
                   relative = '';
                   if (FileStatNode.is(data)) {
-                    relative = pathUtil.relative('/workspace', data.uri.path.toString());
+                    relative = pathUtil.relative('/', data.uri.path.toString());
                   }
                   copy2clipboard(relative);
                 case 3:

package/es/file/file-create-modal.d.ts

@@ -1,8 +1,12 @@
 /// <reference types="react" resolution-mode="require"/>
-import type { ModalItem, ModalItemProps } from '@difizen/mana-app';
+import type { ModalItemProps, ModalItem } from '@difizen/mana-app';
+import './index.less';
 export interface ModalItemType {
     path: string;
+    fileType?: FileType;
 }
+type FileType = '.ipynb' | '.py' | '.json' | '.sql' | undefined;
 export declare const FileCreateModalComponent: React.FC<ModalItemProps<ModalItemType>>;
 export declare const FileCreateModal: ModalItem<ModalItemType>;
+export {};
 //# sourceMappingURL=file-create-modal.d.ts.map

package/es/file/file-create-modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-create-modal.d.ts","sourceRoot":"","sources":["../../src/file/file-create-modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAQnE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAuD5E,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,aAAa,CAGpD,CAAC"}
+{"version":3,"file":"file-create-modal.d.ts","sourceRoot":"","sources":["../../src/file/file-create-modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnE,OAAO,cAAc,CAAC;AAWtB,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,KAAK,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAEhE,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAmJ5E,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,aAAa,CAGpD,CAAC"}

package/es/file/file-create-modal.js

@@ -9,25 +9,94 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { URI, useInject, ViewManager } from '@difizen/mana-app';
-import { Input, Modal } from 'antd';
+import { Col, Form, message, Row, Input, Modal } from 'antd';
 import { useEffect, useRef, useState } from 'react';
-import { FileView, JupyterFileService } from "./index.js";
+import "./index.less";
+import { FileView, JSONIcon, JupyterFileService, MoreIcon, NotebookIcon, PythonIcon } from "./index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export var FileCreateModalComponent = function FileCreateModalComponent(_ref) {
   var visible = _ref.visible,
     close = _ref.close,
     data = _ref.data;
   var fileService = useInject(JupyterFileService);
   var viewManager = useInject(ViewManager);
-  var _useState = useState(''),
+  var _useState = useState(data.fileType),
     _useState2 = _slicedToArray(_useState, 2),
-    newFileName = _useState2[0],
-    setNewFileName = _useState2[1];
+    fileType = _useState2[0],
+    setFileType = _useState2[1];
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
     fileView = _useState4[0],
     setFileView = _useState4[1];
   var inputRef = useRef(null);
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var onFinish = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return form.validateFields();
+          case 2:
+            close();
+            _context.prev = 3;
+            _context.next = 6;
+            return fileService.newFile(values.fileName + fileType || '', new URI(data.path));
+          case 6:
+            if (fileView) {
+              fileView.model.refresh();
+            }
+            _context.next = 12;
+            break;
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](3);
+            message.error('新建文件失败');
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[3, 9]]);
+    }));
+    return function onFinish(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var validateFileName = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rule, value, callback) {
+      var targetURI, fileRes;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(!value || !value.length)) {
+              _context2.next = 4;
+              break;
+            }
+            throw new Error('请输入文件名');
+          case 4:
+            targetURI = new URI(data.path + value + (fileType || ''));
+            _context2.next = 7;
+            return fileService.resolve(targetURI);
+          case 7:
+            fileRes = _context2.sent;
+            if (!fileRes.isFile) {
+              _context2.next = 10;
+              break;
+            }
+            throw new Error('文件名称已存在，请重新输入');
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function validateFileName(_x2, _x3, _x4) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     var _inputRef$current;
     viewManager.getOrCreateView(FileView).then(function (view) {
@@ -38,61 +107,114 @@ export var FileCreateModalComponent = function FileCreateModalComponent(_ref) {
     });
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
   });
-  return /*#__PURE__*/_jsx(Modal, {
+  return /*#__PURE__*/_jsxs(Modal, {
     title: "\u65B0\u5EFA\u6587\u4EF6",
     open: visible,
     onCancel: close,
-    onOk: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return fileService.newFile(newFileName, new URI(data.path));
-          case 2:
-            if (fileView) {
-              fileView.model.refresh();
-            }
-            close();
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })),
+    width: 788,
+    cancelText: "\u53D6\u6D88",
+    okText: "\u786E\u5B9A",
+    onOk: function onOk() {
+      form.submit();
+    },
     keyboard: true,
-    children: /*#__PURE__*/_jsx(Input, {
-      value: newFileName,
-      onChange: function onChange(e) {
-        setNewFileName(e.target.value);
-      },
-      ref: inputRef,
-      onKeyDown: /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                if (!(e.keyCode === 13)) {
-                  _context2.next = 5;
-                  break;
-                }
-                _context2.next = 3;
-                return fileService.newFile(newFileName, new URI(data.path));
-              case 3:
-                if (fileView) {
-                  fileView.model.refresh();
-                }
-                close();
-              case 5:
-              case "end":
-                return _context2.stop();
-            }
-          }, _callee2);
-        }));
-        return function (_x) {
-          return _ref3.apply(this, arguments);
-        };
-      }()
-    })
+    wrapClassName: "libro-create-file-modal",
+    children: [/*#__PURE__*/_jsxs("div", {
+      className: "libro-create-file-path-container",
+      children: [/*#__PURE__*/_jsx("div", {
+        className: "libro-create-file-des",
+        children: "\u521B\u5EFA\u4F4D\u7F6E\uFF1A"
+      }), /*#__PURE__*/_jsx("span", {
+        className: "libro-create-file-path",
+        children: data.path
+      })]
+    }), /*#__PURE__*/_jsx("div", {
+      className: "libro-create-file-des",
+      children: "\u6587\u4EF6\u7C7B\u578B\uFF1A"
+    }), /*#__PURE__*/_jsxs(Row, {
+      children: [/*#__PURE__*/_jsx(Col, {
+        className: "gutter-row",
+        style: {
+          paddingLeft: 'unset',
+          paddingRight: '16px'
+        },
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "libro-create-file-type ".concat(fileType === '.ipynb' ? 'active' : ''),
+          onClick: function onClick() {
+            setFileType('.ipynb');
+          },
+          children: [/*#__PURE__*/_jsx(NotebookIcon, {}), /*#__PURE__*/_jsx("span", {
+            className: "libro-create-file-type-text",
+            children: "Notebook"
+          })]
+        })
+      }), /*#__PURE__*/_jsx(Col, {
+        className: "gutter-row",
+        style: {
+          paddingLeft: 'unset',
+          paddingRight: '16px'
+        },
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "libro-create-file-type ".concat(fileType === '.py' ? 'active' : ''),
+          onClick: function onClick() {
+            setFileType('.py');
+          },
+          children: [/*#__PURE__*/_jsx(PythonIcon, {}), /*#__PURE__*/_jsx("span", {
+            className: "libro-create-file-type-text",
+            children: "Python"
+          })]
+        })
+      }), /*#__PURE__*/_jsx(Col, {
+        className: "gutter-row",
+        style: {
+          paddingLeft: 'unset',
+          paddingRight: '16px'
+        },
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "libro-create-file-type ".concat(fileType === '.json' ? 'active' : ''),
+          onClick: function onClick() {
+            setFileType('.json');
+          },
+          children: [/*#__PURE__*/_jsx(JSONIcon, {}), /*#__PURE__*/_jsx("span", {
+            className: "libro-create-file-type-text",
+            children: "JSON"
+          })]
+        })
+      }), /*#__PURE__*/_jsx(Col, {
+        className: "gutter-row",
+        style: {
+          paddingLeft: 'unset',
+          paddingRight: '16px'
+        },
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "libro-create-file-type ".concat(fileType === undefined ? 'active' : ''),
+          onClick: function onClick() {
+            setFileType(undefined);
+          },
+          children: [/*#__PURE__*/_jsx(MoreIcon, {}), /*#__PURE__*/_jsx("span", {
+            className: "libro-create-file-type-text",
+            children: "\u5176\u4ED6"
+          })]
+        })
+      })]
+    }), /*#__PURE__*/_jsx(Form, {
+      layout: "vertical",
+      autoComplete: "off",
+      form: form,
+      onFinish: onFinish,
+      className: "libro-create-file-form",
+      children: /*#__PURE__*/_jsx(Form.Item, {
+        name: "fileName",
+        label: "\u6587\u4EF6\u540D\u79F0",
+        rules: [{
+          required: true,
+          validator: validateFileName
+        }],
+        children: /*#__PURE__*/_jsx(Input, {
+          addonAfter: fileType || ''
+        })
+      })
+    })]
   });
 };
 export var FileCreateModal = {

package/es/file/file-createdir-modal-contribution.d.ts

@@ -1,5 +1,5 @@
 import { ModalContribution } from '@difizen/mana-app';
 export declare class FileCreateDirModalContribution implements ModalContribution {
-    registerModal(): import("@difizen/mana-app").ModalItem<import("./file-createdir-modal.js").ModalItemType>;
+    registerModal(): import("@difizen/mana-app").ModalItem<import("./file-createdir-modal.js").FileDirCreateModalItemType>;
 }
 //# sourceMappingURL=file-createdir-modal-contribution.d.ts.map

package/es/file/file-createdir-modal.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" resolution-mode="require"/>
 import type { ModalItem, ModalItemProps } from '@difizen/mana-app';
-export interface ModalItemType {
+import './index.less';
+export interface FileDirCreateModalItemType {
     path: string;
 }
-export declare const FileCreateDirModalComponent: React.FC<ModalItemProps<ModalItemType>>;
-export declare const FileDirCreateModal: ModalItem<ModalItemType>;
+export declare const FileCreateDirModalComponent: React.FC<ModalItemProps<FileDirCreateModalItemType>>;
+export declare const FileDirCreateModal: ModalItem<FileDirCreateModalItemType>;
 //# sourceMappingURL=file-createdir-modal.d.ts.map

package/es/file/file-createdir-modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-createdir-modal.d.ts","sourceRoot":"","sources":["../../src/file/file-createdir-modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAYnE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,2BAA2B,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAsD/E,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,SAAS,CAAC,aAAa,CAGvD,CAAC"}
+{"version":3,"file":"file-createdir-modal.d.ts","sourceRoot":"","sources":["../../src/file/file-createdir-modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAUnE,OAAO,cAAc,CAAC;AAEtB,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,2BAA2B,EAAE,KAAK,CAAC,EAAE,CAChD,cAAc,CAAC,0BAA0B,CAAC,CAqF3C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,SAAS,CAAC,0BAA0B,CAGpE,CAAC"}