|
5 | 5 | , 'nbextensions/visualpython/src/common/constant' |
6 | 6 | , 'nbextensions/visualpython/src/common/StringBuilder' |
7 | 7 | , 'nbextensions/visualpython/src/common/vpFuncJS' |
8 | | -], function (requirejs, $, vpCommon, vpConst, sb, vpFuncJS) { |
| 8 | + , 'nbextensions/visualpython/src/common/vpSetting' |
| 9 | +], function (requirejs, $, vpCommon, vpConst, sb, vpFuncJS, vpSetting) { |
9 | 10 | // 옵션 속성 |
10 | 11 | const funcOptProp = { |
11 | 12 | stepCount : 1 |
@@ -144,22 +145,34 @@ define([ |
144 | 145 | }); |
145 | 146 | } catch {} |
146 | 147 | } else { |
147 | | - this.packageList.forEach((package, i) => { |
148 | | - // <select class="vp-add-type"> |
149 | | - // <option value="as">as</option> |
150 | | - // <option value="import">import</option> |
151 | | - // </select> |
152 | | - // var tagTr = $(`<tr><td><input id="vp_library${i}" type="text" class="vp-input m vp-add-library" placeholder="library name" required value="${package.library.toLowerCase()}"/></td> |
153 | | - // <td><input id="vp_alias${i}" type="text" class="vp-input m vp-add-alias" placeholder="as" value="${package.alias}"/></td> |
154 | | - // <td><input type="button" class="vp-remove-option w100" style="width:100%;" value="x"></td></tr>`); |
155 | | - var tagTr = $(that.renderLibraryRow(i, package.library.toLowerCase(), package.alias)); |
156 | | - |
157 | | - $(this.wrapSelector("#vp_tblImport tr:last")).before(tagTr); |
| 148 | + |
| 149 | + var that = this; |
| 150 | + // load package list |
| 151 | + vpSetting.loadUserDefinedCode(function(data) { |
| 152 | + if (data && Array.isArray(data)) { |
| 153 | + // set package list with data |
| 154 | + that.packageList = data; |
| 155 | + } |
| 156 | + // render default package list |
| 157 | + that.packageList.forEach((package, i) => { |
| 158 | + // <select class="vp-add-type"> |
| 159 | + // <option value="as">as</option> |
| 160 | + // <option value="import">import</option> |
| 161 | + // </select> |
| 162 | + // var tagTr = $(`<tr><td><input id="vp_library${i}" type="text" class="vp-input m vp-add-library" placeholder="library name" required value="${package.library.toLowerCase()}"/></td> |
| 163 | + // <td><input id="vp_alias${i}" type="text" class="vp-input m vp-add-alias" placeholder="as" value="${package.alias}"/></td> |
| 164 | + // <td><input type="button" class="vp-remove-option w100" style="width:100%;" value="x"></td></tr>`); |
| 165 | + var tagTr = $(that.renderLibraryRow(i, package.library.toLowerCase(), package.alias)); |
158 | 166 |
|
159 | | - // add to package input |
160 | | - // that.package.input.push({ name: `vp_library${i}`}); |
161 | | - // that.package.input.push({ name: `vp_alias${i}`}); |
162 | | - }); |
| 167 | + $(that.wrapSelector("#vp_tblImport tr:last")).before(tagTr); |
| 168 | + |
| 169 | + // add to package input |
| 170 | + // that.package.input.push({ name: `vp_library${i}`}); |
| 171 | + // that.package.input.push({ name: `vp_alias${i}`}); |
| 172 | + }); |
| 173 | + }, 'vpimport'); |
| 174 | + |
| 175 | + |
163 | 176 | } |
164 | 177 |
|
165 | 178 | // 라이브러리 삭제 |
@@ -262,6 +275,9 @@ define([ |
262 | 275 | this.cellExecute(sbCode.toString(), exec); |
263 | 276 | } |
264 | 277 |
|
| 278 | + // save import packages |
| 279 | + vpSetting.saveUserDefinedCode(importMeta, 'vpimport'); |
| 280 | + |
265 | 281 | // TODO: 전체에게 해당 함수 리턴 요청 |
266 | 282 | this.generatedCode = sbCode.toString(); |
267 | 283 | return sbCode.toString(); |
|
0 commit comments