forked fromzhangchunlin/uliweb-apijson
- Notifications
You must be signed in to change notification settings - Fork4
Sync#27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Sync#27
Changes fromall commits
Commits
Show all changes
5 commits Select commitHold shift + click to select a range
5559694 apijson post/put/delete should get model name from request_tag settin…
zhangchunlinc5bf66b modify apijson-table prop from table_name to model_name, add request_…
zhangchunlin2870457 add new component apijson-viewedit
zhangchunlin6c840d0 remove create and delete permission for owner in user table
zhangchunlinc3e149c fix row_saved not update problem after save
zhangchunlinFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletiondemo/apps/tables/templates/Tables/list.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletionsuliweb_apijson/apijson/settings.ini
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
61 changes: 36 additions & 25 deletionsuliweb_apijson/apijson/templates/vue/inc_apijson_table.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletionsuliweb_apijson/apijson/templates/vue/inc_apijson_viewedit.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| <script> | ||
| Vue.component('apijson-viewedit', { | ||
| delimiters: ['{', '}'], | ||
| props: [ | ||
| "model_name", | ||
| "request_tag", | ||
| "id", | ||
| "config", | ||
| "custom_tcolumns_render_generator", | ||
| "hook_init", | ||
| "hook_ajax_params" | ||
| ], | ||
| template: ` | ||
| <i-form @submit.native.prevent :label-width="80"> | ||
| <form-item v-for="item in viewedit_items" :key="item.key" :label="item.title"> | ||
| <i-input v-if="item.component=='input'" v-model="item.value" :readonly="!editable(item)"></i-input> | ||
| <checkbox v-if="item.component=='checkbox'" v-model="item.value" :disabled="!editable(item)"></checkbox> | ||
| <i-input v-if="item.component=='textarea'" v-model="item.value" type="textarea" :autosize="{minRows: 2,maxRows: 5}"></i-input> | ||
| </form-item> | ||
| <form-item v-if="config_editable" label="action"> | ||
| <i-button type="info" icon="ios-download" size="large" @click="save">Save</i-button> | ||
| </form-item> | ||
| </i-form> | ||
| `, | ||
| data: function(){ | ||
| return { | ||
| l_request_tag: null, | ||
| role: "{{=role}}", | ||
| row: {}, | ||
| row_saved: {}, | ||
| viewedit_items: [], | ||
| config_editable: false, | ||
| config_viewedit_fields: null, | ||
| } | ||
| }, | ||
| methods: { | ||
| init_viewedit: function(){ | ||
| var params = {} | ||
| var model_params = { | ||
| "id":this.id, | ||
| "@role":this.role | ||
| } | ||
| params[this.model_name] = model_params | ||
| var thisp = this | ||
| $.ajax({ | ||
| type: "POST", | ||
| url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.get')}}", | ||
| contentType: 'application/json', | ||
| data: JSON.stringify(params), | ||
| success: function (data) { | ||
| if (data.code==200) { | ||
| thisp.row = data[thisp.model_name] | ||
| thisp.row_saved = thisp.row | ||
| thisp.viewedit_items = [] | ||
| if (thisp.config_viewedit_fields!=null) { | ||
| for (var i in thisp.config_viewedit_fields) { | ||
| var d = thisp.config_viewedit_fields[i] | ||
| d.value = thisp.row[d.key] | ||
| d.component = d.component || "input" | ||
| thisp.viewedit_items.push(d) | ||
| } | ||
| } | ||
| } | ||
| else { | ||
| thisp.$Notice.error({ | ||
| title: 'error when get table '+thisp.table_name, | ||
| desc: data.msg | ||
| }) | ||
| } | ||
| } | ||
| }) | ||
| }, | ||
| editable: function(item){ | ||
| var editable = true | ||
| if (item.editable!=null) {editable=item.editable} | ||
| return this.config_editable && editable && (item.key!="id") | ||
| }, | ||
| save: function(){ | ||
| var params = { | ||
| "@tag": this.l_request_tag | ||
| } | ||
| var record_params = {} | ||
| //only save modified fields | ||
| for (var k in this.viewedit_items) { | ||
| var d = this.viewedit_items[k] | ||
| if (d.key=="id"|| d.value!=this.row_saved[d.key]) { | ||
| record_params[d.key] = d.value | ||
| this.row[d.key] = d.value | ||
| } | ||
| } | ||
| params[this.l_request_tag] = record_params | ||
| params = this.ajax_hook("apijson_put","update",params) | ||
| var thisp = this | ||
| $.ajax({ | ||
| type: "POST", | ||
| url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.put')}}", | ||
| contentType: 'application/json', | ||
| data: JSON.stringify(params), | ||
| success: function (data) { | ||
| if (data.code==200){ | ||
| thisp.row_saved = thisp.row | ||
| thisp.$Notice.success({ | ||
| title: 'success update #'+thisp.row.id+' in table '+thisp.model_name, | ||
| desc: data.msg | ||
| }) | ||
| } | ||
| else { | ||
| thisp.$Notice.error({ | ||
| title: 'error when update #'+thisp.row.id+' in table '+thisp.model_name, | ||
| desc: data.msg | ||
| }) | ||
| } | ||
| } | ||
| }) | ||
| }, | ||
| ajax_hook: function(method,action,params) { | ||
| if (this.hook_ajax_params!=null) { | ||
| var after_hook = this.hook_ajax_params(method,action,params) | ||
| if (after_hook!=null) { | ||
| params = after_hook | ||
| } | ||
| else { | ||
| console.log("warning: hook_ajax_params('"+method+"','"+action+"',params) return null, so ignore this hook") | ||
| } | ||
| } | ||
| return params | ||
| } | ||
| }, | ||
| mounted: function(){ | ||
| if (this.request_tag==null) { | ||
| this.l_request_tag = this.model_name | ||
| } | ||
| else { | ||
| this.l_request_tag = this.request_tag | ||
| } | ||
| //if not do this, the first notice will hide behind the navigation bar in uliweb apps | ||
| this.$Notice.config({top: 100,duration: 8}); | ||
| if (this.hook_init!=null) { | ||
| this.hook_init(this) | ||
| } | ||
| if (this.config!=null){ | ||
| this.config_editable = this.config.editable || false | ||
| this.config_viewedit_fields = this.config.viewedit_fields || null | ||
| } | ||
| this.init_viewedit() | ||
| } | ||
| }) | ||
| </script> |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.