@zscreate/form-component 1.1.184 → 1.1.186

package/dist/form-component.umd.js

@@ -59345,7 +59345,7 @@ Sortable.mount(Remove, Revert);
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(38);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(6955);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(6991);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3913);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2633);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2980);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(7203);
@@ -61424,7 +61424,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 3913:
+/***/ 2633:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -73566,8 +73566,8 @@ var componentvue_type_template_id_0709b7a4_scoped_true_render = function () {var
 var componentvue_type_template_id_0709b7a4_scoped_true_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/relateSubSelectModal.vue?vue&type=template&id=fd1ccae2&
-var relateSubSelectModalvue_type_template_id_fd1ccae2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":"选择2","width":_vm.modalWidth,"visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"destroyOnClose":true,"cancelText":"关闭","zIndex":1100000},on:{"ok":_vm.handleSubmit,"cancel":_vm.handleCancel}},[_c('a-table',{ref:"table",attrs:{"size":"middle","bordered":"","scroll":{ x: _vm.columns.filter(function (p, c) { return (p += c.width); }, 0) },"columns":_vm.columns,"dataSource":_vm.dataSource,"loading":_vm.loading,"row-selection":{
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/relateSubSelectModal.vue?vue&type=template&id=972fbc64&
+var relateSubSelectModalvue_type_template_id_972fbc64_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":"选择2","width":_vm.modalWidth,"visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"destroyOnClose":true,"cancelText":"关闭","zIndex":1100000},on:{"ok":_vm.handleSubmit,"cancel":_vm.handleCancel}},[_c('a-table',{ref:"table",attrs:{"size":"middle","bordered":"","scroll":{ x: _vm.columns.filter(function (p, c) { return (p += c.width); }, 0) },"columns":_vm.columns,"dataSource":_vm.dataSource,"loading":_vm.loading,"row-selection":{
       selectedRowKeys: _vm.selectedRowKeys,
       onChange: _vm.onSelectChange,
       type: _vm.widget.options.multiple === false ? 'radio' : 'checkbox',
@@ -73580,7 +73580,7 @@ var relateSubSelectModalvue_type_template_id_fd1ccae2_render = function () {var
       var clearFilters = ref.clearFilters;
       var column = ref.column;
 return _c('div',{staticStyle:{"padding":"8px"}},[_c('a-input',{directives:[{name:"ant-ref",rawName:"v-ant-ref",value:(function (c) { return (_vm.searchInput = c); }),expression:"(c) => (searchInput = c)"}],staticStyle:{"width":"188px","margin-bottom":"8px","display":"block"},attrs:{"placeholder":("搜索 " + (column.title)),"value":selectedKeys[0]},on:{"change":function (e) { return setSelectedKeys(e.target.value ? [e.target.value] : []); },"pressEnter":function () { return _vm.handleSearch(selectedKeys, confirm, column.dataIndex); }}}),_c('a-button',{staticStyle:{"width":"90px","margin-right":"8px"},attrs:{"type":"primary","icon":"search","size":"small","placeholder":"请搜索"},on:{"click":function () { return _vm.handleSearch(selectedKeys, confirm, column.dataIndex); }}},[_vm._v("搜索")]),_c('a-button',{staticStyle:{"width":"90px"},attrs:{"size":"small"},on:{"click":function () { return _vm.handleReset(clearFilters, column.dataIndex); }}},[_vm._v("取消")])],1)}}])})],1)}
-var relateSubSelectModalvue_type_template_id_fd1ccae2_staticRenderFns = []
+var relateSubSelectModalvue_type_template_id_972fbc64_staticRenderFns = []
 
 
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
@@ -73712,7 +73712,8 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
   components: {},
   created() {
     this.queryParam.querySql = this.widget.options.SQL;
-    if (this.widget.options.defaultSQL.datasourceId) this.queryParam.datasourceId = this.widget.options.defaultSQL.datasourceId;
+    console.log(this.widget.options.defaultSQL, 'this.widget.options.defaultSQL.datasourceId');
+    if (this.widget.options.defaultSQL.dataSourceId) this.queryParam.datasourceId = this.widget.options.defaultSQL.dataSourceId;
     if (this.widget.options.defaultSQL.serverId) this.queryParam.serverId = this.widget.options.defaultSQL.serverId;
     this.queryParam.columnName = this.widget.options.columnName;
     this.queryParam.columnCode = this.widget.options.columnCode;
@@ -73767,6 +73768,8 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
           this.columns = [...tempArr, ...this.columns];
           this.dataSource = result.data.records;
         }
+      }).finally(() => {
+        this.loading = false;
       });
     },
     onSelectChange(selectedRowKeys, selectedRows) {
@@ -73883,8 +73886,8 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
 ;
 var relateSubSelectModal_component = (0,componentNormalizer/* default */.Z)(
   Modals_relateSubSelectModalvue_type_script_lang_js_,
-  relateSubSelectModalvue_type_template_id_fd1ccae2_render,
-  relateSubSelectModalvue_type_template_id_fd1ccae2_staticRenderFns,
+  relateSubSelectModalvue_type_template_id_972fbc64_render,
+  relateSubSelectModalvue_type_template_id_972fbc64_staticRenderFns,
   false,
   null,
   null,
@@ -121609,7 +121612,7 @@ var CorrectionItemvue_type_template_id_5e8c04b6_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 853 modules
-var components = __webpack_require__(3913);
+var components = __webpack_require__(2633);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js&
 //
 //
@@ -123480,7 +123483,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 853 modules
-var components = __webpack_require__(3913);
+var components = __webpack_require__(2633);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -126669,7 +126672,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7203__;
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.184"};
+module.exports = {"i8":"1.1.186"};
 
 /***/ })
 
@@ -128263,7 +128266,7 @@ var es_array_sort = __webpack_require__(8284);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util = __webpack_require__(6955);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 853 modules
-var components = __webpack_require__(3913);
+var components = __webpack_require__(2633);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.184",
+  "version": "1.1.186",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",